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

Timestamp:

Apr 30, 2010, 12:54:25 AM (15 years ago)

Author:

ansari

Message:

Ajout classes de transfert DMA vers Ethernet et lecture ethernet, Reza 29/04/2010

File:

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

trunk/AddOn/TAcq/brparam.cc

@@ -4 +4 @@
 #include "strutilxx.h"
 #include "bracqvers.h"
+
+#ifndef BRSPORTID
+#define BRSPORTID 6912
+#endif
 
 /* --Methode-- */
@@ -129 +133 @@
   reducoffset=0;
 
+  tcpportid=BRSPORTID;
+  pci2eth_fgdirect=false;
+  ethr_nlink = 0;
+
   skysource="";
 
@@ -181 +189 @@
   redpqsize=p.redpqsize;
   reducoffset=p.reducoffset;
+
+  pci2eth_fgdirect=p.pci2eth_fgdirect;
+  eths_targets=p.eths_targets;
+  ethr_nlink=p.ethr_nlink;
 
   skysource=p.skysource;
@@ -215 +227 @@
     reducoffset=(uint_4)conf.IParam("reducpaqsz",1,0);
   }
+  // Mot cle pour le mode envoi-reception sur ethernet 
+  tcpportid=conf.IParam("tcpportid",0,BRSPORTID);
+  if (conf.HasKey("pci2ethdirect"))  pci2eth_fgdirect = true;   // Transfer direct DMA -> Ethernet
+  if (conf.HasKey("ethrtargets")) {    // Machines destinations des paquets 
+    for(int it=0; it<conf.NbParam("ethrtargets"); it++) 
+      eths_targets.push_back(conf.SParam("ethrtargets",it));
+  }
+  ethr_nlink=conf.IParam("ethrnlink",0,0);   // Nombre de sources de paquets en reception ethernet 
+
+
   if (conf.HasKey("monitor")) {
     fgdoProc=true;
@@ -222 +244 @@
   }
   nopciLossRate=conf.DParam("nopcilossrate",0,0.);
-
   fg_hard_ctrlc=conf.HasKey("hard_ctrlc");
   if (conf.HasKey("nosavesigfits"))  savesigfits=false;
@@ -322 +343 @@
     os << " PaquetSize Reduction, ReducedSize=" << redpqsize << " Offset=" << reducoffset << endl;
   }
+  if (eths_targets.size()>0)   {
+    cout << " DMA->Ethernet NbTargets=" << eths_targets.size() << ((pci2eth_fgdirect)?" (DirectTransferMode) " : " " ) << " :" << endl;
+    for(size_t it=0; it<eths_targets.size(); it++) cout << eths_targets[it] << " , ";
+    cout << endl;
+  }
+  cout << " EthernetRead NbSources (=NbLinks)= " << ethr_nlink << endl;
   if (fgdoProc>0) 
     os << " Monitoring  NMeanProc=" << nmeanProc << " StepProc=" << stepProc << " NMaxProc=" << nmaxProc << endl;