Changeset 3897 in Sophya for trunk/AddOn/TAcq/brparam.cc

Timestamp:

Oct 4, 2010, 4:19:59 PM (15 years ago)

Author:

ansari

Message:

Amelioration des classes PCIEToEthernet et EthernetReader pour eviter des situations de blocage lorsque lecture avec ForceSameFrameCounter, Reza 04/10/2010

File:

• trunk/AddOn/TAcq/brparam.cc (modified) (4 diffs)

trunk/AddOn/TAcq/brparam.cc

@@ -135 +135 @@
   tcpportid=BRSPORTID;
   pci2eth_fgdirect=false;
-  ethr_nlink = 0;
-  ethr_forcesamefc_ = false;
+  ethr_nlink=0;
+  ethr_forcesamefc_=false;
+  ethr_sfc_maxdpc_=50;
+  ethr_sfc_maxresync_=50;
 
   skysource="";
@@ -208 +210 @@
   ethr_nlink=p.ethr_nlink;
   ethr_forcesamefc_=p.ethr_forcesamefc_;
+  ethr_sfc_maxdpc_=p.ethr_sfc_maxdpc_;
+  ethr_sfc_maxresync_=p.ethr_sfc_maxresync_;
 
   skysource=p.skysource;
@@ -254 +258 @@
   }
   ethr_nlink=conf.IParam("ethrnlink",0,0);   // Nombre de sources de paquets en reception ethernet 
-  if (conf.HasKey("ethrforcesamefc"))   ethr_forcesamefc_=true;   // force SAME FrameCounter   on all links
+  if (conf.HasKey("ethrforcesamefc"))  {
+    ethr_forcesamefc_=true;   // force SAME FrameCounter   on all links
+    ethr_sfc_maxdpc_=conf.IParam("ethrforcesamefc",0,50);
+    ethr_sfc_maxresync_=conf.IParam("ethrforcesamefc",1,50);
+  }
 
   //  Parametre de controle du monitoring 
@@ -387 +395 @@
     cout << endl;
   }
-  cout << " TCP-PortId=" << tcpportid << " EthernetRead NbSources (=NbLinks)= " << ethr_nlink 
-       << ((ethr_forcesamefc_)?" ForceSameFrameCounter read mode":" AllOKPaquets read mode ") << endl;
+  cout << " TCP-PortId=" << tcpportid << " EthernetRead NbSources (=NbLinks)= " << ethr_nlink << endl;
+  if (ethr_forcesamefc_)
+    cout << "EthernetReader mode: ForceSameFrameCounter read mode with Max_PaquetCounterDiff= " 
+         << ethr_sfc_maxdpc_ << " MaxNbResync=" << ethr_sfc_maxresync_ << endl;
+  else
+    cout << "EthernetReader mode: AllOKPaquets read mode " << endl;
 
   if (fgdoProc>0)