Changeset 1993 in Sophya for trunk/ArchTOIPipe/Kernel/toiseqbuff.cc

Timestamp:

May 9, 2002, 10:22:37 PM (23 years ago)

Author:

ansari

Message:

Ajout de lock()/unlock() ds toiseqbuff.cc - Reza 9/5/2002

File:

• trunk/ArchTOIPipe/Kernel/toiseqbuff.cc (modified) (12 diffs)

trunk/ArchTOIPipe/Kernel/toiseqbuff.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toiseqbuff.cc,v 1.12 2002-05-08 22:22:33 ansari Exp $
+// $Id: toiseqbuff.cc,v 1.13 2002-05-09 20:22:37 ansari Exp $
 
 #include "toiprocessor.h"
@@ -125 +125 @@
 
 void TOISeqBuffered::getData(int i, double & val, uint_8 & flg) {
+  lock();
   if (!started) { 
     cout << " TOISeqBuffered::getData() - waitGet() Waiting for start ... " << endl;
@@ -135 +136 @@
            << " i=" << i << " next_in= " << next_in 
            << " next_out=" << next_out << endl;
+    unlock();
     throw RangeCheckError("TOISeqBuffered::getData(i) : data deleted");
   }
@@ -158 +160 @@
            << " i=" << i << " next_in= " << next_in 
            << " next_out=" << next_out << endl;
-    signalPut(); broadcast();
-  }
+    signalPut(); 
+  }
+  unlock();
+  if (fgsigput)  signal();
   return;
 }
@@ -166 +170 @@
 void TOISeqBuffered::getData(int i, int n, double* data, uint_8* flg)
 {
+  lock();
   if (!started) { 
     cout << " TOISeqBuffered::getData(i,n ...) - waitGet() Waiting for start ... " << endl;
@@ -176 +181 @@
            << " i=" << i << " next_in= " << next_in 
            << " next_out=" << next_out << endl;
+    unlock();
     throw RangeCheckError("TOISeqBuffered::getData(i) : data deleted");
   }
@@ -200 +206 @@
              << " i=" << i << " next_in= " << next_in 
              << " next_out=" << next_out << endl;
-      signalPut(); broadcast();
-    }
-  }
-  return;
-  
+      signalPut(); 
+    }
+  }
+  unlock();
+  if (fgsigput)  signal();
+  return;  
 }
 
@@ -238 +245 @@
 
 void TOISeqBuffered::putData(int i, double value, uint_8 flag) {
+  lock();
   if (!started) {
     first_in = next_in = i;
@@ -250 +258 @@
              << " next_out=" << next_out << endl;
       string msg = "TOISeqBuffered::putData() : i!=next_in TOIname="  + getName();
+      unlock();
       throw RangeCheckError(msg);
     }
@@ -272 +281 @@
            << " i=" << i << " next_in= " << next_in 
            << " next_out=" << next_out << endl;
-    signalGet(); broadcast();
-  }
-}
-
-void TOISeqBuffered::putData(int i, int n, double const* val, uint_8 const* flg) {
+    signalGet(); 
+  }
+  unlock();
+  if (fgsigget)  signal();
+  return;
+}
+
+void TOISeqBuffered::putData(int i, int n, double const* val, uint_8 const* flg) 
+{
+  lock();
   if (!started) {
     first_in = next_in = i;
@@ -289 +303 @@
              << " next_out=" << next_out << endl;
       string msg = "TOISeqBuffered::putData() : i!=next_in TOIname="  + getName();
+      unlock();
       throw RangeCheckError(msg);
     }
@@ -314 +329 @@
            << " i=" << i << " next_in= " << next_in 
            << " next_out=" << next_out << endl;
-    signalGet(); broadcast();
-  }
+    signalGet(); 
+  }
+  unlock();
+  if (fgsigget)  signal();
+  return;
 }