Changeset 3758 in Sophya

Timestamp:

Apr 30, 2010, 2:46:42 PM (15 years ago)

Author:

ansari

Message:

Debug divers classes/progeramme envoi-reception paquets sur Ethernet, Reza 30/04/2010

Location:

trunk/AddOn/TAcq

Files:

• mfacq.cc (modified) (3 diffs)
• racqueth.cc (modified) (13 diffs)
• racqueth.h (modified) (2 diffs)

trunk/AddOn/TAcq/mfacq.cc

@@ -72 +72 @@
   if (narg>3)  {
     basedir=arg[2];
-    for(int jj=2; jj<narg; jj++)  oargs.push_back(arg[jj]);
+    for(int jj=3; jj<narg; jj++)  oargs.push_back(arg[jj]);
   }
   try {
@@ -165 +165 @@
     mmgr.SetFinalizedMask(((uint_4)MemZS_Saved) | ((uint_4)MemZS_Proc));
     cout << " mfacq[1.b]/Info: Mmgr.SetFinalizedMask( MemZS_Saved | MemZS_Proc )" << endl;
+    //mmgr.SetFinalizedMask( (uint_4)MemZS_Saved );
+    //cout << " mfacq[1.b]/Info: Mmgr.SetFinalizedMask( MemZS_Saved  )" << endl;
   }
   
@@ -198 +200 @@
   string ppath=bpar.OutputDirectory();
   MonitorProc PrThr(mmgr);
+  cout << "mfacq[3] Creating   PCIEMultiReader thread object     " << endl;
   vector<PCIEWrapperInterface*> vec_pciw;
-  for  (int i=0 ;i<bpar.NFibers();i++)  vec_pciw.push_back( pciwp[i]);
-  cout << "mfacq[3] Creating   PCIEMultiReader thread object     " << endl;
+  for  (int i=0 ;i<bpar.NFibers();i++)  {
+    vec_pciw.push_back( pciwp[i]);
+    //    cout << " mfacq[3.b]/Debug - pciwp[" << i << "] " << hex << pciwp[i] << dec << endl;
+  }
   PCIEMultiReader PcierThr(vec_pciw, mmgr, bpar.GetParams());
   //  usleep(200);  attente au cas ou ...

trunk/AddOn/TAcq/racqueth.cc

@@ -42 +42 @@
 
   char msg[BRTCPMSGLEN];
+  cout << "PCIEToEthernet/Info: Establishing TCP/IP connections ... " << endl;
   for(size_t i=0; i<vec_pciw_.size(); i++) {
     vector<ClientSocket> vskt;
-    for(size_t j=0; j<vskt.size(); j++) {
+    for(size_t j=0; j<destname_.size(); j++) {
       ClientSocket sok(destname_[j], tcpportid_);
       for(int ii=0; ii<BRTCPMSGLEN; ii++) msg[ii]='\0';
@@ -57 +58 @@
     vvec_skt_.push_back(vskt);    
   }
+  totrdsnd_ = 0;
 }
 
@@ -74 +76 @@
   struct timeval tv1,tv2;
   gettimeofday(&tv1, NULL);
-  uint_8 totrdsnd = 0;
   
   cout << " PCIEToEthernet::run() - Starting , NMaxMemZones=" <<  par_.MaxNbBlocs()
@@ -83 +84 @@
   // sigaddset(&act.sa_mask,SIGINT);  // pour proteger le transfert DMA
   //sigaction(SIGINT,&act,NULL);        
-  uint_4 paqszmm = par_.MMgrNbPaquet();
+  uint_4 paqszmm = par_.MMgrPaquetSize();
   uint_4 paqsz =  packSize_;
   uint_4 dmasz = vec_pciw_[0]->TransferSize();
@@ -103 +104 @@
   // Initialisation des tampons pour recopie des paquets a cheval pour chaque DMA
   for (int i=0;i< (int)nbDma_ ;i++) {  
+    //    cout << " DEBUG*AB paqsz=" << paqsz << " paqszmm=" << paqszmm << endl;
+    tampon[i]=nexpaq[i]=NULL;
     tampon[i] = new Byte[paqsz];
     nexpaq[i] = new Byte[paqszmm];
@@ -131 +134 @@
     for(size_t j=0; j<vskt.size(); j++) {
       for(int ii=0; ii<BRTCPMSGLEN; ii++) msg[ii]='\0';
-      vskt[i].Receive(msg,BRTCPMSGLEN);
-      if (strncmp(msg,"BAORadio-EthernetReader-Ready-GO",32)!=0)
+      vskt[j].Receive(msg,BRTCPMSGLEN);
+      if (strncmp(msg,"BAORadio-EthernetReader-Ready-GO",32)!=0) {
+        msg[BRTCPMSGLEN-1]='\0';
+        cout << "PCIEToEthernet:ERROR BAD Go for fiber=" << i << " dest=" << j << " msg: " << msg << endl;
         throw SocketException("PCIEToEthernet:ERROR/  BAD Go message from EthernetReader ");
-    }
-    cout << " PCIEToEthernet::run() Received GO message for Fiber/DMA " << i << " from " << destname_[i] << endl;
+      }
+    cout << " PCIEToEthernet::run() Received GO message for Fiber/DMA " << i << " from " << destname_[j] << endl;
+    }
   }
 
@@ -165 +171 @@
     }
     if (fgbaddma) continue;  
+
     if (fgdirectsend) {  // Pas de copie / reduction de taille de paquet, on rebalance tel quel ...
       for (int fib=0; fib<(int) nbDma_ ;fib++) {
-        vector<ClientSocket>& vskt = vvec_skt_[fib];
-        for(size_t j=0; j<vskt.size(); j++) {
-          vskt[j].Send((const char *)Datas[fib], dmasz);
-          totrdsnd += dmasz;
-        }
+        //DBG cout << " DEBUG*B fib=" << fib << " Datas[fib]=" << hex << Datas[fib] << dec << endl; 
+        SendToTargets(fib, Datas[fib], dmasz);
         trnbytes[fib] += (uint_8)dmasz;
         npaqfait[fib] += (trnbytes[fib]/(uint_8)paqszmm);
@@ -179 +183 @@
       continue;  // On bypasse le reste 
     }
+
     // Si on arrive ici, c'est qu'il faut copier / reduire les paquets ....
     uint_4 curoff=0;
@@ -205 +210 @@
           }
           BRPaquet paq(nexpaq[fib], packSizeInMgr_);
-          vector<ClientSocket>& vskt = vvec_skt_[fib];
-          for(size_t j=0; j<vskt.size(); j++) {
-            vskt[j].Send((const char *)nexpaq[fib], packSizeInMgr_);
-            totrdsnd += packSizeInMgr_;
-          }
+          SendToTargets(fib, nexpaq[fib], packSizeInMgr_);
           npaqfait[fib]++;
           if (fib==nbDma_-1) npaqfaitg++;  // Ne pas oublier le compteur de paquets faits 
@@ -244 +245 @@
           }
           BRPaquet paq(nexpaq[fib], packSizeInMgr_);
-          vector<ClientSocket>& vskt = vvec_skt_[fib];
-          for(size_t j=0; j<vskt.size(); j++) {
-            vskt[j].Send((const char *)nexpaq[fib], packSizeInMgr_);
-            totrdsnd += packSizeInMgr_;
-          }
+          SendToTargets(fib, nexpaq[fib], packSizeInMgr_);
           npaqfait[fib]++;
           if (fib==nbDma_-1) npaqfaitg++;  // Ne pas oublier le compteur de paquets faits 
@@ -269 +266 @@
   if (tmelaps2<0.1) tmelaps2=0.1; 
   cout << " ---------- PCIEToEthernet::run()-End summary NPaqFait=" << npaqfaitg 
-       << " TotSend (kb)=" << totrdsnd/1024 << "------ " << endl;
+       << " TotSend (kb)=" << totrdsnd_/1024 << "------ " << endl;
   for (int dma=0; dma < (int)nbDma_ ;dma++)   {
     cout << " --Fib=" << dma << " NPaqFait=" << npaqfait[dma] <<  " TotDMATransfer=" 
@@ -305 +302 @@
 }
 
-
+static long cnt_prt=0;
+/* --Methode-- */
+size_t PCIEToEthernet::SendToTargets(int fib, Byte* data, size_t len)
+{
+  //DBG   cout << " SendToTargets/DBG" << cnt_prt << " len=" << len << " data=" << hex << (unsigned long)data << dec << endl; cnt_prt++; 
+  vector<ClientSocket>& vskt = vvec_skt_[fib];
+  size_t rc=0;
+  for(size_t j=0; j<vskt.size(); j++) {
+    rc += vskt[j].Send((const char *)data, len);
+    totrdsnd_ += len;
+  }
+  return rc;
+}
 //------------------------------------------------------------------
 // Classe thread de lecture sur interface reseau (Ethernet) 
@@ -369 +378 @@
     strcpy(msg,"BAORadio-EthernetReader-Ready-GO");
     for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++) {
+      cout << " EthernetReader/Debug - Sending GO message to sender " << fib << endl;
       vsok_[fib].Send(msg,BRTCPMSGLEN);
     }

trunk/AddOn/TAcq/racqueth.h

@@ -55 +55 @@
 
 protected: 
+  virtual size_t SendToTargets(int fib, Byte* data, size_t len);
+
   BRParList par_;   // Parametres divers d'acquisition 
 
@@ -68 +70 @@
   uint_4 packSizeInMgr_;
   uint_4 nbDma_;
+  uint_8 totrdsnd_;
 
 };