Changeset 3764 in Sophya for trunk/AddOn/TAcq/racqueth.cc

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

File:

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

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) {