Changeset 3764 in Sophya for trunk/AddOn/TAcq

Timestamp:

May 3, 2010, 9:11:20 AM (15 years ago)

Author:

ansari

Message:

Suppression du parametre taille des blocs pour transfert ethernet ds le code pour les classes PCIEToEthernet et EthernetReader, Reza 03/05/2010

Location:

trunk/AddOn/TAcq

Files:

• acqparam_exemple.d (modified) (1 diff)
• brparam.cc (modified) (4 diffs)
• brparam.h (modified) (1 diff)
• mfacq.cc (modified) (2 diffs)
• racqueth.cc (modified) (4 diffs)
• racqueth.h (modified) (4 diffs)

trunk/AddOn/TAcq/acqparam_exemple.d

@@ -49 +49 @@
 #  @ethrnlink 4
 ethrnlink 4
-## No de port TCP/IP et taille des blocs lors des transferts sur ethernet  
+## No de port TCP/IP   
 #  @tcpportid 6912
-#  @ethtrbsz 1024
 tcpportid 6912
-ethtrbsz 1024
 #  Pour desactiver l'ecriture des fichiers FITS
 #  @nosavesigfits

trunk/AddOn/TAcq/brparam.cc

@@ -134 +134 @@
 
   tcpportid=BRSPORTID;
-  eth_transfer_blksz=1024;
   pci2eth_fgdirect=false;
   ethr_nlink = 0;
@@ -192 +191 @@
 
   tcpportid=p.tcpportid;
-  eth_transfer_blksz=p.eth_transfer_blksz;
   pci2eth_fgdirect=p.pci2eth_fgdirect;
   eths_targets=p.eths_targets;
@@ -232 +230 @@
   // Mot cle pour le mode envoi-reception sur ethernet 
   tcpportid=conf.IParam("tcpportid",0,BRSPORTID);
-  eth_transfer_blksz=(size_t)conf.IParam("ethtrbsz",0,1024);
   if (conf.HasKey("pci2ethdirect"))  pci2eth_fgdirect = true;   // Transfer direct DMA -> Ethernet
   if (conf.HasKey("ethrtargets")) {    // Machines destinations des paquets 
@@ -348 +345 @@
   }
   if (eths_targets.size()>0)   {
-    cout << " DMA->Ethernet NbTargets=" << eths_targets.size() << ((pci2eth_fgdirect)?" (DirectTransferMode) " : " " ) << " :" << endl;
+    cout << " DMA->Ethernet NbTargets=" << eths_targets.size() 
+         << ((pci2eth_fgdirect)?" (DirectTransferMode) " : " " ) << " :";
     for(size_t it=0; it<eths_targets.size(); it++) cout << eths_targets[it] << " , ";
     cout << endl;
   }
-  cout << " EthernetRead NbSources (=NbLinks)= " << ethr_nlink << endl;
+  cout << " TCP-PortId=" << tcpportid << " EthernetRead NbSources (=NbLinks)= " << ethr_nlink << endl;
   if (fgdoProc>0) 
     os << " Monitoring  NMeanProc=" << nmeanProc << " StepProc=" << stepProc << " NMaxProc=" << nmaxProc << endl;

trunk/AddOn/TAcq/brparam.h

@@ -160 +160 @@
   // ---- Variables specifiques em mode transfert DMA vers Ethernet 
   int tcpportid;     // No de port TCP/IP
-  size_t eth_transfer_blksz;    //taille des blocs pour le transfert a travers ethernet
   // Cote Send DMA -> Ethernet 
   bool pci2eth_fgdirect;   // true -> direct transfer DMA to Ethernet  

trunk/AddOn/TAcq/mfacq.cc

@@ -295 +295 @@
   PCIEToEthernet pci2eth(vec_pciw, bpar.GetParams().GetEthTargets(), bpar.GetParams(), bpar.GetParams().tcpportid);
   pci2eth.SetPrintLevel(1);
-  pci2eth.SetEthSendBlockSize(bpar.GetParams().eth_transfer_blksz);
   //  usleep(200);  attente au cas ou ...
   pPcie2Eth=&pci2eth;
@@ -348 +347 @@
   cout << "mfacq[3] Creating   EthernetReader thread object     " << endl;
   EthernetReader ethrdr(mmgr, bpar.GetParams(), bpar.GetParams().tcpportid, false);
-  ethrdr.SetEthRecvBlockSize(acpar.eth_transfer_blksz);
 
   //  usleep(200);  attente au cas ou ...

trunk/AddOn/TAcq/racqueth.cc

@@ -64 +64 @@
   }
   totrdsnd_ = 0;
-  SetEthSendBlockSize();
   SetPrintLevel();
 }
@@ -336 +335 @@
   for(size_t j=0; j<vskt.size(); j++) {
     rc += vskt[j].SendAll((const char *)data, len);
-    totrdsnd_ += eths_bsz_;
+    totrdsnd_ += len;
   }
   vec_cntpaq_[fib]++;
   return rc;
-  /*  
-  if (eths_bsz_<16) {
-    for(size_t j=0; j<vskt.size(); j++) {
-      rc += vskt[j].SendAll((const char *)data, len);
-      totrdsnd_ += eths_bsz_;
-    }
-    vec_cntpaq_[fib]++;
-    return rc;
-  }
-  size_t nblk = len/eths_bsz_;
-  size_t fblk = len%eths_bsz_;
-  size_t off = 0;
-  if (nblk>0) {
-    for(size_t i=0; i<nblk; i++) {
-      for(size_t j=0; j<vskt.size(); j++) {
-        rc += vskt[j].SendAll((const char *)data+off, eths_bsz_);
-        totrdsnd_ += eths_bsz_;
-      }
-      off += eths_bsz_;
-    }
-  }
-  if (fblk>0) {
-    for(size_t j=0; j<vskt.size(); j++) {
-      rc += vskt[j].SendAll((const char *)data+off, fblk);
-      totrdsnd_ += fblk;
-    }
-  }
-  vec_cntpaq_[fib]++;
-  return rc;
-  */
 }
 //------------------------------------------------------------------
@@ -423 +392 @@
   }
 
-  SetEthRecvBlockSize();
   SetPrintLevel();
 }
@@ -565 +533 @@
   vec_cntpaq_[fib]++;
 
-  /*    
-  if (ethr_bsz_<16) {
-    rc += vsok_[fib].ReceiveAll(data, len);
-  }
-  else {
-    size_t nblk = len/ethr_bsz_;
-    size_t fblk = len%ethr_bsz_;
-    size_t off = 0;
-    if (nblk>0) {
-      for(size_t i=0; i<nblk; i++)  {
-        rc += vsok_[fib].ReceiveAll(data+off, ethr_bsz_);
-        off += ethr_bsz_;  
-      }
-    }
-    if (fblk>0) {
-      rc += vsok_[fib].ReceiveAll(data+off, fblk);
-    } 
-  }
+  /*     
+  size_t nblk = len/ethr_bsz_;
+  size_t fblk = len%ethr_bsz_;
+  size_t off = 0;
+  if (nblk>0) {
+    for(size_t i=0; i<nblk; i++)  {
+      rc += vsok_[fib].ReceiveAll(data+off, ethr_bsz_);
+      off += ethr_bsz_;  
+    }
+  }
+  if (fblk>0) {
+    rc += vsok_[fib].ReceiveAll(data+off, fblk);
+  } 
   vec_cntpaq_[fib]++;
-    */
+  */
 
   if (vec_cntpaq_[fib]%par_.MMgrNbPaquet() == 0) {

trunk/AddOn/TAcq/racqueth.h

@@ -57 +57 @@
   inline void STOP() { stop_ = true; }  
 
-  inline size_t SetEthSendBlockSize(size_t bsz=1024)
-  { size_t rs=eths_bsz_;  eths_bsz_=bsz; return rs; }
   inline int SetPrintLevel(int lev=0) { prtlev_=lev; return 0;}
 
@@ -80 +78 @@
   uint_8 totrdsnd_;
   bool fgdirectsend_;  //  true -> direct transfer of DMA data to ethernet
-  size_t eths_bsz_;
+
   int prtlev_;
 };
@@ -94 +92 @@
   inline void STOP() { stop_ = true; }  
 
-  inline size_t SetEthRecvBlockSize(size_t bsz=1024)
-  { size_t rs=ethr_bsz_;  ethr_bsz_=bsz; return rs; }
   inline int SetPrintLevel(int lev=0) { prtlev_=lev; return 0;}
 
@@ -141 +137 @@
   Byte* mmbufib_[MAXANAFIB];  // Pointeurs zone memoire de chaque fibre rendu par RAcqMemZoneMgr 
 
-  size_t ethr_bsz_;
   int prtlev_;
 };