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

Timestamp:

Dec 3, 2009, 12:17:04 AM (16 years ago)

Author:

ansari

Message:

correction et petites amelioration - Reza 03/12/2009

File:

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

trunk/AddOn/TAcq/brbaseproc.cc

@@ -19 +19 @@
 BRBaseProcessor::BRBaseProcessor(RAcqMemZoneMgr& memgr)
   : memgr_(memgr), vpaq_(memgr.NbFibres()), vpchk_(memgr.NbFibres()), vfgok_(memgr.NbFibres()), 
-    curfc_(memgr.NbFibres())
+    curfc_(memgr.NbFibres()), fcfirst_(memgr.NbFibres()), ttfirst_(memgr.NbFibres())
 {
   stop_ = false;
   for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++)  {
+    fbuff_.push_back(NULL);
     vpaq_[fib]=BRPaquet(NULL,memgr_.PaqSize());
     vpchk_[fib]=BRPaqChecker(true,0); 
     vfgok_[fib]=true;
     curfc_[fib]=0;
+    fcfirst_[fib]=0;
+    ttfirst_[fib]=0;
   }
-  fcfirst_=ttfirst_=0;
+  fgokallfibers_=true;
   totprocnpaq_=0;
 }
@@ -42 +45 @@
 
     size_t paqsz=memgr_.PaqSize();
-    vector<Byte*> fbuff;
-    for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++)  fbuff.push_back(NULL);
     bool fgrun=true;
     while (fgrun) {
@@ -55 +56 @@
         break;  
       }
+      for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++) {
+        fbuff_[fib] = memgr_.GetMemZone(mid,fib);
+        if (fbuff_[fib] == NULL) { // cela ne devrait pas arriver 
+          cout << "BRBaseProcessor::run()/ERROR memgr.GetMemZone(" << mid << "," << fib << ") -> NULL" << endl;
+          setRC(9);       fgrun=false;          
+          break;
+        }
+      }
       for(size_t jp=0; jp<memgr_.NbPaquets(); jp++) {   // boucle sur les paquets d'une zone  
         fgokallfibers_=true;
         for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++) {
-          fbuff[fib] = memgr_.GetMemZone(mid,fib);
-          if (fbuff[fib] == NULL) { // cela ne devrait pas arriver 
-            cout << "BRBaseProcessor::run()/ERROR memgr.GetMemZone(" << mid << "," << fib << ") -> NULL" << endl;
-            setRC(9);     fgrun=false;          
-            break;
-          }
-          vpaq_[fib].Set(fbuff[fib]+jp*paqsz);
+          vpaq_[fib].Set(fbuff_[fib]+jp*paqsz);
           vfgok_[fib] = vpchk_[fib].Check(vpaq_[fib],curfc_[fib]);
           if (!vfgok_[fib])  fgokallfibers_=false;
         }
         //--- Traitement 
-        int rcp = Process();
-        totprocnpaq_++;
+        int rcp=0;
+        if (fgokallfibers_)  {
+          if (totprocnpaq_==0) {
+            for(size_t fib=0; fib<(size_t)memgr_.NbFibres(); fib++)  {
+              fcfirst_[fib]=curfc_[fib];
+              ttfirst_[fib]=vpaq_[fib].TimeTag();
+            }
+          }
+          rcp=Process();
+          totprocnpaq_++;
+        }
         //      if (rcp != 0)   { fgrun=false; break; }
       }  // Fin de boucle sur les paquets 
@@ -101 +113 @@
   // la methode par defaut ne fait rien 
   // if (fgokallfibers_) { faire le traitement }
-  return 0;
-  /*    Exemple de code test 
+  //  return 0;
+  /*    Exemple de code test  */
   if ( totprocnpaq_ % 1000 == 0 ) {
     cout << " BRVisibilityCalculator::Process() " << totprocnpaq_ << " FrameCnt=" ;
@@ -113 +125 @@
       cout << "   seconds" << endl;
   }
-
-   */
+  return 0;
 }