Changeset 3681 in Sophya for trunk/AddOn/TAcq/mfacq.cc

Timestamp:

Nov 20, 2009, 12:46:54 PM (16 years ago)

Author:

ansari

Message:

Ajout classe de traitement en ligne (monitoring) MonitorProc , Reza 20/11/2009

File:

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

trunk/AddOn/TAcq/mfacq.cc

@@ -124 +124 @@
   RAcqMemZoneMgr mmgr(acpar.nZones, bpar.NFibers(), acpar.nPaqZone, acpar.MMgrPaquetSize());
   pMmgr=&mmgr;  
-  int stepproc = 2;  
-  int nmean = acpar.nPaqZone*acpar.NBlocPerFile/stepproc;
-
+  if (acpar.fgdoProc && (acpar.stepProc>0)) {
+    // Dans ce cas, toutes les zones doivent passer ds le thread de monitoring 
+    // pour etre au moins marque comme traite - seul 1/acpar.stepProc sont effectivement traite 
+    mmgr.SetFinalizedMask(((uint_4)MemZS_Saved) | ((uint_4)MemZS_Proc));
+    cout << " mfacq[1.b]/Info: Mmgr.SetFinalizedMask( MemZS_Saved | MemZS_Proc )" << endl;
+  }
+  
 #ifndef NOPCIECARD  
-
   for (int i=0 ;i <acpar.NFibers() ;i++) {
     UINT32 card=(acpar.FiberNum[i]-1)/2+1;
@@ -147 +150 @@
 #endif 
 
-  cout <<"mfacq[3] Creating DataSaver and DataProc2C objects ... " << endl;
+  cout <<"mfacq[2] Creating MultiDataSaver and  MonitorProc thread objects ... " << endl;
   MultiDataSaver DsThr(mmgr);   //   Utilise les parametres globaux BRAcqConfig
   string ppath=bpar.OutputDirectory();
-  DataProc2C PrThr(mmgr, ppath, 1280, stepproc, acpar.NMaxProc);
+  MonitorProc PrThr(mmgr);
   vector<PCIEWrapperInterface*> vec_pciw;
   for  (int i=0 ;i<bpar.NFibers();i++)  vec_pciw.push_back( pciwp[i]);
-  cout << "mfacq[3] Creating   PCIEMultiReader       " << endl;
+  cout << "mfacq[3] Creating   PCIEMultiReader thread object     " << endl;
   PCIEMultiReader PcierThr(vec_pciw, mmgr, bpar.GetParams());
-  usleep(200);  // attente au cas ou ...
+  //  usleep(200);  attente au cas ou ...
   pPcierThr=&PcierThr;
   tm.Split("Threads created");  
-  cout << "mfacq[4] - starting 3 threads pcir, ds, pr ... " << endl;
+  if (acpar.fgdoProc>0) 
+    cout << "mfacq[4] - starting three threads: PCIEMultiReader, MultiDataSaver, MonitorProc ... " << endl;
+  else 
+    cout << "mfacq[4] - starting two threads: PCIEMultiReader, MultiDataSaver  ... " << endl;
+
   PcierThr.start();
   DsThr.start();
-  if (acpar.NMaxProc>0) { // On ne demarre que si au moins NMaxProc>0
+  if (acpar.fgdoProc>0) { // On ne demarre que si au moins NMaxProc>0
     PrThr.start();
   }
   
   // On attend avant de declencher la terminaison des threads
-  usleep(100000);
+  usleep(200000);
   
   cout << "mfacq[5] -  Waiting for threads to finish ... " << endl;  
@@ -172 +179 @@
   DsThr.join();
   mmgr.Stop();
-  if (acpar.NMaxProc>0) { // On ne demarre que si au moins NMaxProc>0
+  if (acpar.fgdoProc) { // On n'attend la fin que si le thread a ete demarre (NMaxProc>0)
     PrThr.join();
   }
@@ -179 +186 @@
   tm.Split("Threads Finished");  
  
+  mmgr.Print(cout);
 #ifndef NOPCIECARD
   for (int i=0 ;i <acpar.NbFibers ;i++) {