Changeset 3623 in Sophya for trunk/AddOn/TAcq/racqumem.cc

Timestamp:

May 22, 2009, 9:59:38 AM (16 years ago)

Author:

ansari

Message:

Modifications et ameliorations diverses pour programme acquisition/traitement multifibres

Reza 22/05/2009

1- Extension/amelioration classe BRPaquet et BRPaqChecker
2- Correction BUG dans RAcqMemZoneMgr bloquant l'utilisation a une seule zone memoire
3- Classe PCIEWrapper devenue virtuelle pure et introduction de la classe TestPCIWrapperNODMA
pour les smulations.

File:

• trunk/AddOn/TAcq/racqumem.cc (modified) (6 diffs)

trunk/AddOn/TAcq/racqumem.cc

@@ -8 +8 @@
 
 RAcqMemZoneMgr::RAcqMemZoneMgr(uint_4 nz, uint_4 np, uint_4 psz)
-  :  mex(true), nzones(nz), npaq(np), paqsz(psz), stop_(false)
+  : mex(true), nzones(nz), npaq(np), paqsz(psz), stop_(false)
 {
   St_MemZ st;
+
   st.act = (uint_4)MemZA_None;
   st.stat = (uint_8)MemZS_Free;
@@ -16 +17 @@
   uint_8 mzsz = npaq*paqsz;
 
-  for(int k=0; k<NbZones(); k++) {
-        memzones.push_back(new Byte[mzsz] );
-        states.push_back(st);
-  }     
+   for(int k=0; k<NbZones(); k++) {
+     memzones.push_back(new Byte[mzsz] );
+     states.push_back(st);
+   }
+  
 }
 
@@ -34 +36 @@
   mex.lock();
   while ((rid < 0)&&(!stop_)) {
-    switch (act) {
-          case MemZA_Fill:
-            for(int k=0; k<NbZones(); k++) {
-              if ((states[k].act == MemZA_None) && 
-                  ((states[k].stat == MemZS_Free)||(states[k].stat & MemZS_Saved)) ) 
-                    rid = k; break; 
-            }
-            if (rid >= 0) { states[rid].act = MemZA_Fill; states[rid].stat = MemZS_Free; }
-          break;
-          case MemZA_Save:
-            for(int k=0; k<NbZones(); k++) {
-              if ((states[k].act == MemZA_None) && (states[k].stat & MemZS_Filled) && 
-                  !(states[k].stat & MemZS_Saved) )  rid = k; break; 
-            }
-            if (rid >= 0) states[rid].act = MemZA_Save; 
-          break;
-          case MemZA_Proc:
-            for(int k=0; k<NbZones(); k++) {
-              if ((states[k].act == MemZA_None) && (states[k].stat & MemZS_Filled) && 
-                  !(states[k].stat & MemZS_Proc) )  rid = k; break; 
-            }
-            if (rid >= 0) states[rid].act = MemZA_Proc;                   
-          break;
-    }
-    if (rid < 0) mex.wait();
+    switch (act)
+      {
+      case MemZA_Fill:
+        if (rid < 0) for(uint_4 k=0; k<NbZones(); k++) {
+          if ((states[k].act == MemZA_None) && 
+              ((states[k].stat == MemZS_Free)||(states[k].stat & MemZS_Saved)) ) 
+            { rid = k; break; } 
+        }
+        if (rid >= 0) { states[rid].act = MemZA_Fill; states[rid].stat = MemZS_Free; }
+        break;
+      case MemZA_Save:
+        for(uint_4 k=0; k<NbZones(); k++) {
+          if ((states[k].act == MemZA_None) && (states[k].stat & MemZS_Filled) && 
+              !(states[k].stat & MemZS_Saved) ) { rid = k; break; } 
+        }
+        if (rid >= 0) states[rid].act = MemZA_Save; 
+        break;
+      case MemZA_Proc:
+        for(uint_4 k=0; k<NbZones(); k++) {
+          if ((states[k].act == MemZA_None) && (states[k].stat & MemZS_Filled) && 
+              !(states[k].stat & MemZS_Proc) ) { rid = k; break; } 
+        }
+        if (rid >= 0) states[rid].act = MemZA_Proc;               
+        break;
+      case MemZA_None:   // MTQ pour supprimer un warning
+        break;
+      }
+    if (rid < 0)  mex.wait();
   }
   mex.unlock();
@@ -66 +71 @@
 int RAcqMemZoneMgr::FreeMemZone(int id, MemZStatus st)
 {
-  if ((id < 0) || (id >= states.size()))  return 1;
+  if ((id < 0) || (id >= (int)states.size()))  return 1;
   int rc = 0;
   mex.lock();
@@ -114 +119 @@
   os << "RAcqMemZoneMgr::Print() NbZones=" << NbZones() << " PaqSize()=" << PaqSize()
      << " NbPaquets()=" << NbPaquets() << " ZoneSize()=" << ZoneSize() << endl;
-  for(int k=0; k<states.size(); k++) 
+  for(uint_4 k=0; k<states.size(); k++) 
     os << " [" << k << "] Act=" << states[k].act << " Stat=" << states[k].stat 
        << " NbAct[0..2]=" << states[k].nbact[0] << "," << states[k].nbact[1]
@@ -123 +128 @@
 void RAcqMemZoneMgr::Stop()
 {
+  //  cout << "RAcqMemZoneMgr::Stop() ........ STOP                          BROADCAST" <<endl; 
   stop_ = true;
   mex.broadcast();