Changeset 3872 in Sophya for trunk/AddOn/TAcq/brbaseproc.cc

Timestamp:

Aug 28, 2010, 12:43:04 AM (15 years ago)

Author:

ansari

Message:

Ajout classe BRFFTCalculator et programme specmfib.cc, Reza 28/08/2010

File:

• trunk/AddOn/TAcq/brbaseproc.cc (modified) (8 diffs)

trunk/AddOn/TAcq/brbaseproc.cc

@@ -18 +18 @@
 /* --Methode-- */
 BRBaseProcessor::BRBaseProcessor(RAcqMemZoneMgr& memgr, MemZaction mmact)
-  : memgr_(memgr), vpaq_(memgr.NbFibres()), vpchk_(memgr.NbFibres()), vfgok_(memgr.NbFibres()), 
+  : memgr_(memgr), fbuff_(memgr.NbFibres()), fprocbuff_(memgr.NbFibres()),
+    vpaq_(memgr.NbFibres()), vprocpaq_(memgr.NbFibres()),
+    vpchk_(memgr.NbFibres()), vfgok_(memgr.NbFibres()), 
     curfc_(memgr.NbFibres()), fcfirst_(memgr.NbFibres()), ttfirst_(memgr.NbFibres())
 {
@@ -24 +26 @@
   stop_ = false;
   for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++)  {
-    fbuff_.push_back(NULL);
+    fbuff_[fib]=NULL; 
+    fprocbuff_[fib]=NULL; 
     vpaq_[fib]=BRPaquet(NULL,memgr_.PaqSize());
+    vprocpaq_[fib]=NULL; 
     vpchk_[fib]=BRPaqChecker(true,0); 
     vfgok_[fib]=true;
@@ -75 +79 @@
   int rc=0;
   try {
-    cout << " BRBaseProcessor[" << bpid_ << "]::run() - Starting " << " NFibers=" << memgr_.NbFibres() 
-         << " NChan=" << 2*memgr_.NbFibres() << endl;   
+    cout << "BRBaseProcessor[" << bpnom_ << "," << bpid_ << "]::run() - Starting " << " NFibers=" 
+         << memgr_.NbFibres() << " NChan=" << 2*memgr_.NbFibres() << endl;      
 
     size_t paqsz=memgr_.PaqSize();
+    size_t procpaqsz=memgr_.ProcPaqSize();
     bool fgrun=true;
     while (fgrun) {
@@ -87 +92 @@
       //      if (buffg == NULL) {
       if (mid < 0) {
-        cout << "BRBaseProcessor[" << bpid_ << "]::run()/ERROR FindMemZoneId(" 
+        cout << "BRBaseProcessor[" << bpnom_ << "," << bpid_ << "]::run()/ERROR FindMemZoneId(" 
              << (int)mmact_ << ") ->" << mid << ") -> NULL" << endl;
         setRC(7);      fgrun=false;             
@@ -95 +100 @@
         fbuff_[fib] = memgr_.GetMemZone(mid,fib);
         if (fbuff_[fib] == NULL) { // cela ne devrait pas arriver 
-          cout << "BRBaseProcessor[" << bpid_ << "]::run()/ERROR memgr.GetMemZone(" << mid << "," << fib << ") -> NULL" << endl;
+          cout << "BRBaseProcessor[" << bpnom_ << "," << bpid_ << "]::run()/ERROR memgr.GetMemZone(" 
+               << mid << "," << fib << ") -> NULL" << endl;
+          setRC(9);       fgrun=false;          
+          break;
+        }
+        if ((procpaqsz>0)&&((fprocbuff_[fib]=memgr_.GetProcMemZone(mid,fib))==NULL)) {   // cela ne devrait pas arriver non plus
+          cout << "BRBaseProcessor[" << bpnom_ << "," << bpid_ << "]::run()/ERROR memgr.GetProcMemZone(" 
+               << mid << "," << fib << ") -> NULL" << endl;
           setRC(9);       fgrun=false;          
           break;
@@ -106 +118 @@
           vfgok_[fib] = vpchk_[fib].Check(vpaq_[fib],curfc_[fib]);
           if (!vfgok_[fib])  fgokallfibers_=false;
+          if (procpaqsz>0)    vprocpaq_[fib] = fprocbuff_[fib]+jp*procpaqsz;
         }
         //--- Traitement 
@@ -124 +137 @@
     } // Fin de boucle sur les zones a traiter 
     //------------------------------------
-    cout << " ---- END BRBaseProcessor[" << bpid_ << "]::run() , TotNbProcPaq=" << totprocnpaq_ << endl;
+    cout << " ---- END BRBaseProcessor[" << bpnom_ << "," << bpid_ << "]::run() , TotNbProcPaq=" 
+         << totprocnpaq_ << endl;
     /*
     for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++)  vpchk_[fib].Print();
@@ -131 +145 @@
   }
   catch (std::exception& exc) {
-    cout << " BRBaseProcessor[" << bpid_ << "]::run()/catched std::exception " << exc.what() << endl;
+    cout << "BRBaseProcessor[" << bpnom_ << "," << bpid_ << "]::run()/catched std::exception " << exc.what() << endl;
     setRC(98);  
     return; 
   }
   catch(...) {
-    cout << " BRBaseProcessor[" << bpid_ << "]::run()/catched unknown ... exception " << endl;
+    cout << "BRBaseProcessor[" << bpnom_ << "," << bpid_ << "]::run()/catched unknown ... exception " << endl;
     setRC(99);  
     return;