Changeset 1709 in Sophya

Timestamp:

Oct 19, 2001, 12:21:18 PM (24 years ago)

Author:

aubourg

Message:

lock problem

File:

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

trunk/ArchTOIPipe/Kernel/toisegment.cc

@@ -219 +219 @@
     LOG(cout << "BufferView " << hex << this << dec << ": read fault for " << sn << endl)
     sync();
+    pthread_mutex_lock(&(master->read_wait_mutex));
     while (sn0<0 || sn >= sn0 + segmentSize*segments.size()) {
-      wait();
+      wait(); // must be atomic with loop test
+      pthread_mutex_unlock(&(master->read_wait_mutex));
       LOG(cout << "BufferView " << hex << this << dec << ": waiting for " << sn << endl)
       sync();
-    }
+      pthread_mutex_lock(&(master->read_wait_mutex));
+    }
+    pthread_mutex_unlock(&(master->read_wait_mutex));
+
     LOG(cout << "BufferView " << hex << this << dec << ": resuming for " << sn 
         << " now data for " << sn0 << " - " << sn0 + segmentSize*segments.size() 
@@ -234 +239 @@
 }
 
-void TOISegmented::BufferView::wait() { /* reader thread */
-  pthread_mutex_lock(&(master->read_wait_mutex));
+void TOISegmented::BufferView::wait() { /* reader thread, master read wait lock taken */
+  //pthread_mutex_lock(&(master->read_wait_mutex));
   waiting = true;
   pthread_cond_wait(&(master->read_wait_condv), &(master->read_wait_mutex)); 
   waiting = false;
-  pthread_mutex_unlock(&(master->read_wait_mutex));
+  //pthread_mutex_unlock(&(master->read_wait_mutex));
 }