Changeset 3955 in Sophya for trunk/AddOn

Timestamp:

Mar 2, 2011, 3:27:58 PM (15 years ago)

Author:

ansari

Message:

Ajout des actions de traitemnt ProcG,ProcH,ProcI,ProcJ ds le gestionnaire memoire RAcqMemZoneMgr et adaptation de BRBaseProcessor, Reza 02/03/2011

Location:

trunk/AddOn/TAcq

Files:

• brbaseproc.cc (modified) (1 diff)
• brbaseproc.h (modified) (1 diff)
• racqumem.cc (modified) (3 diffs)
• racqumem.h (modified) (3 diffs)

trunk/AddOn/TAcq/brbaseproc.cc

@@ -67 +67 @@
   case MemZA_ProcF:
     mmsta_=MemZS_ProcF;    
+    break;
+  case MemZA_ProcG:
+    mmsta_=MemZS_ProcG;    
+    break;
+  case MemZA_ProcH:
+    mmsta_=MemZS_ProcH;    
+    break;
+  case MemZA_ProcI:
+    mmsta_=MemZS_ProcI;    
+    break;
+  case MemZA_ProcJ:
+    mmsta_=MemZS_ProcI;    
     break;
   default:

trunk/AddOn/TAcq/brbaseproc.h

@@ -36 +36 @@
   inline void setNameId(const char* nom, int id) 
   { bpnom_=nom;   bpid_=id;  }
-  inline void setNameId(string nom, int id) 
+  inline void setNameId(string const& nom, int id) 
   { bpnom_=nom;   bpid_=id;  }
 

trunk/AddOn/TAcq/racqumem.cc

@@ -72 +72 @@
       (act != MemZA_ProcA) && (act != MemZA_ProcB) && (act != MemZA_ProcC) &&
       (act != MemZA_ProcD) && (act != MemZA_ProcE) && (act != MemZA_ProcF) && 
+      (act != MemZA_ProcG) && (act != MemZA_ProcH) && (act != MemZA_ProcI) && 
+      (act != MemZA_ProcJ) &&
       (act != MemZA_SaveProc) ) return rid;
 
@@ -159 +161 @@
         if (rid >= 0) states[rid].act = MemZA_ProcF;              
         break;
+      case MemZA_ProcG:
+        for(uint_4 k=0; k<NbZones(); k++) {
+          if ((states[k].act == MemZA_None) && (states[k].stat & MemZS_Filled) && 
+              (states[k].stat & MemZS_ProcF) && !(states[k].stat & MemZS_ProcG) ) { 
+            if (states[k].serial < bestserial) { rid=k; bestserial=states[k].serial; } 
+          }
+        }
+        if (rid >= 0) states[rid].act = MemZA_ProcG;              
+        break;
+      case MemZA_ProcH:
+        for(uint_4 k=0; k<NbZones(); k++) {
+          if ((states[k].act == MemZA_None) && (states[k].stat & MemZS_Filled) && 
+              (states[k].stat & MemZS_ProcG) && !(states[k].stat & MemZS_ProcH) ) { 
+            if (states[k].serial < bestserial) { rid=k; bestserial=states[k].serial; } 
+          }
+        }
+        if (rid >= 0) states[rid].act = MemZA_ProcH;              
+        break;
+      case MemZA_ProcI:
+        for(uint_4 k=0; k<NbZones(); k++) {
+          if ((states[k].act == MemZA_None) && (states[k].stat & MemZS_Filled) && 
+              (states[k].stat & MemZS_ProcH) && !(states[k].stat & MemZS_ProcI) ) { 
+            if (states[k].serial < bestserial) { rid=k; bestserial=states[k].serial; } 
+          }
+        }
+        if (rid >= 0) states[rid].act = MemZA_ProcI;              
+        break;
+      case MemZA_ProcJ:
+        for(uint_4 k=0; k<NbZones(); k++) {
+          if ((states[k].act == MemZA_None) && (states[k].stat & MemZS_Filled) && 
+              (states[k].stat & MemZS_ProcI) && !(states[k].stat & MemZS_ProcJ) ) { 
+            if (states[k].serial < bestserial) { rid=k; bestserial=states[k].serial; } 
+          }
+        }
+        if (rid >= 0) states[rid].act = MemZA_ProcJ;              
+        break;
       case MemZA_SaveProc:
         for(uint_4 k=0; k<NbZones(); k++) {
@@ -245 +283 @@
       states[id].act = MemZA_None;
       break;
+    case MemZS_ProcG :
+      if (states[id].act != MemZA_ProcG)  rc = 1024;
+      else states[id].nbact[9]++;         
+      states[id].stat |= MemZS_ProcG; 
+      states[id].act = MemZA_None;
+      break;
+    case MemZS_ProcH :
+      if (states[id].act != MemZA_ProcH)  rc = 2048;
+      else states[id].nbact[10]++;        
+      states[id].stat |= MemZS_ProcH; 
+      states[id].act = MemZA_None;
+      break;
+    case MemZS_ProcI :
+      if (states[id].act != MemZA_ProcI)  rc = 4096;
+      else states[id].nbact[11]++;        
+      states[id].stat |= MemZS_ProcI; 
+      states[id].act = MemZA_None;
+      break;
+    case MemZS_ProcJ :
+      if (states[id].act != MemZA_ProcJ)  rc = 4096;
+      else states[id].nbact[12]++;        
+      states[id].stat |= MemZS_ProcJ; 
+      states[id].act = MemZA_None;
+      break;
     case MemZS_SavedProc :
-      if (states[id].act != MemZA_SaveProc)  rc = 1024;
-      else states[id].nbact[9]++;         
+      if (states[id].act != MemZA_SaveProc)  rc = 16384;
+      else states[id].nbact[13]++;        
       states[id].stat |= MemZS_ProcF; 
       states[id].act = MemZA_None;

trunk/AddOn/TAcq/racqumem.h

@@ -36 +36 @@
                   MemZS_ProcA=8, MemZS_ProcB=16, MemZS_ProcC=32,
                   MemZS_ProcD=64, MemZS_ProcE=128, MemZS_ProcF=256,
+                  MemZS_ProcG=512, MemZS_ProcH=1024, MemZS_ProcI=2048, MemZS_ProcJ=4096,
                   MemZS_SavedProc=16384 };
 
@@ -42 +43 @@
                   MemZA_ProcA=8, MemZA_ProcB=16, MemZA_ProcC=32,
                   MemZA_ProcD=64, MemZA_ProcE=128, MemZA_ProcF=256,
+                  MemZA_ProcG=512, MemZA_ProcH=1024, MemZA_ProcI=2048, MemZA_ProcJ=4096,
                   MemZA_SaveProc=16384 };
 
@@ -54 +56 @@
 // --------------------------------------------------------------------
 // Structure de gestion utilisee par la classe RAcqMemMgr
-#define MXNACTMZM  10
+#define MXNACTMZM  14
 typedef struct {
   uint_8 serial;    // Numero de serie permettant d'ordonner en temps les zones memoire rempli