Changeset 1773 in Sophya

Timestamp:

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

Author:

aubourg

Message:

race condition magique

Location:

trunk/ArchTOIPipe/Kernel

Files:

• toiprocessor.cc (modified) (2 diffs)
• toisegment.cc (modified) (4 diffs)
• toisegment.h (modified) (2 diffs)

trunk/ArchTOIPipe/Kernel/toiprocessor.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toiprocessor.cc,v 1.19 2001-11-13 16:22:47 aubourg Exp $
+// $Id: toiprocessor.cc,v 1.20 2001-11-16 14:10:42 aubourg Exp $
 
 #include "toiprocessor.h"
@@ -373 +373 @@
 void TOIProcessor::autoWontNeed(int iCur) {
   if (neededHistory <=0) return;
-  if (iCur < lastAWN + neededHistory) return;
+  if (iCur < lastAWN + neededHistory/10) return;
   lastAWN = iCur;
   // cout << name << " wontNeedBefore "  << iCur-neededHistory << endl;

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));

trunk/ArchTOIPipe/Kernel/toisegment.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toisegment.h,v 1.14 2001-11-14 14:49:05 aubourg Exp $
+// $Id: toisegment.h,v 1.15 2001-11-16 14:10:43 aubourg Exp $
 
 #ifndef TOISEGMENT_H
@@ -180 +180 @@
 
     bool waiting;
+    int  waitingFor;
 
     friend class MasterView;