Changeset 2024 in Sophya for trunk/ArchTOIPipe

Timestamp:

May 30, 2002, 12:09:06 PM (23 years ago)

Author:

ansari

Message:

Correction de pb divers - Reza 30/5/2002

Location:

trunk/ArchTOIPipe

Files:

• Kernel/toiseqbuff.cc (modified) (8 diffs)
• TestPipes/aksj02.cc (modified) (1 diff)

trunk/ArchTOIPipe/Kernel/toiseqbuff.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toiseqbuff.cc,v 1.14 2002-05-30 08:41:25 ansari Exp $
+// $Id: toiseqbuff.cc,v 1.15 2002-05-30 10:09:06 ansari Exp $
 
 #include "toiprocessor.h"
@@ -149 +149 @@
       cout << " ... Out of waitGet() i=" << i
            << " next_in= " << next_in << " next_out=" << next_out << endl;
-  }
-  cleanWaitGet();
+    cleanWaitGet();
+  }
   val = dataRef(i);
   flg = flagRef(i);
@@ -162 +162 @@
     signalPut(); 
   }
-  unlock();
-  if (fgsigput)  signal();
+  if (fgsigput)  broadcast();
+  unlock();
   return;
 }
@@ -195 +195 @@
         cout << " ... Out of waitGet() j=" << j
              << " next_in= " << next_in << " next_out=" << next_out << endl;
-    }
-    cleanWaitGet();
+      cleanWaitGet();
+    }
     data[j-i] = dataRef(j);
     if (flg) flg[j-i] = flagRef(j);
@@ -206 +206 @@
              << " i=" << i << " next_in= " << next_in 
              << " next_out=" << next_out << endl;
-      signalPut(); 
-    }
-  }
-  unlock();
-  if (fgsigput)  signal();
+      //      signalPut(); 
+      broadcast();
+    }
+  }
+  unlock();
+  //  if (fgsigput)  signal();
   return;  
 }
@@ -281 +282 @@
            << " i=" << i << " next_in= " << next_in 
            << " next_out=" << next_out << endl;
-    signalGet(); 
-  }
-  unlock();
-  if (fgsigget)  signal();
+    broadcast();
+    //    signalGet(); 
+  }
+  //  if (fgsigget)  broadcast();
+  unlock();
   return;
 }
@@ -313 +315 @@
              << " j=" << j 
              << " next_in= " << next_in << " next_out=" << next_out << endl;
+      broadcast();
       waitPut();
       if (dbglev > 0) 
         cout << " ... Out of waitPut() j=" << j
              << " next_in= " << next_in << " next_out=" << next_out << endl;
-    }
-    cleanWaitPut();
+      cleanWaitPut();
+    }
     dataRef(j) = val[j-i];
     if (flg) flagRef(j) = flg[j-i];
     else flagRef(j) = 0;
     next_in = j+1;
-  }
+    if (isGetWaiting() && (next_in-next_out > wsize/8))  { 
+      if (dbglev > 0) 
+        cout << " TOISeqBuffered::putData(i,n ...) - signalGet() name=" << getName()
+             << " i=" << i << " next_in= " << next_in 
+             << " next_out=" << next_out << endl;
+      // signalGet(); 
+      broadcast();
+    }
+  }
+  /*
   if (isGetWaiting() && (next_in-next_out > wsize/8))  { 
     if (dbglev > 0) 
@@ -329 +341 @@
            << " i=" << i << " next_in= " << next_in 
            << " next_out=" << next_out << endl;
-    signalGet(); 
-  }
-  unlock();
-  if (fgsigget)  signal();
+    //signalGet(); 
+    broadcast();
+  }
+  */
+  //  if (fgsigget)  broadcast();
+  unlock();
   return;
 }

trunk/ArchTOIPipe/TestPipes/aksj02.cc

@@ -240 +240 @@
 
   InitTim();
-
+  if ((soff2_dofg == true) && (wtoi < 32768))      wtoi = 32768;
   cout << ">>>> aksj02: Infile= " << infile << " outFile=" 
        << outfile << endl;