Changeset 1773 in Sophya for trunk/ArchTOIPipe/Kernel/toisegment.cc

Timestamp:

Nov 16, 2001, 3:10:43 PM (24 years ago)

Author:

aubourg

Message:

race condition magique

File:

• trunk/ArchTOIPipe/Kernel/toisegment.cc (modified) (4 diffs)

trunk/ArchTOIPipe/Kernel/toisegment.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toisegment.cc,v 1.22 2001-11-14 13:45:39 aubourg Exp $
+// $Id: toisegment.cc,v 1.23 2001-11-16 14:10:43 aubourg Exp $
 
 #include "toisegment.h"
@@ -240 +240 @@
   firstNeeded = -1;
   waiting = false;
+  waitingFor = -1;
 }
 
@@ -295 +296 @@
     pthread_mutex_lock(&(master->read_wait_mutex));
     while (sn0<0 || sn >= sn0 + segmentSize*segments.size()) {
-      wait(); // must be atomic with loop test // $CHECK$ est-ce vrai ?
+      wait(sn); // must be atomic with loop test // $CHECK$ est-ce vrai ?
       pthread_mutex_unlock(&(master->read_wait_mutex));
       LOG(cout << master->name << " BufferView " << hex << this << dec << ": waiting for " << sn << endl)
@@ -313 +314 @@
 }
 
-void TOISegmented::BufferView::wait() { /* reader thread, master read wait lock taken */
+void TOISegmented::BufferView::wait(int sn) { /* reader thread, master read wait lock taken */
   //pthread_mutex_lock(&(master->read_wait_mutex));
   waiting = true;
+  waitingFor = sn;
   master->waitingViews++;
   pthread_cond_wait(&(master->read_wait_condv), &(master->read_wait_mutex)); 
   waiting = false;
+  waitingFor = -1;
   master->waitingViews--;
   //pthread_mutex_unlock(&(master->read_wait_mutex));