Changeset 1711 in Sophya

Timestamp:

Oct 19, 2001, 4:00:40 PM (24 years ago)

Author:

aubourg

Message:

bugs de synchro corriges

Location:

trunk/ArchTOIPipe/Kernel

Files:

• toisegment.cc (modified) (9 diffs)
• toisegment.h (modified) (1 diff)

trunk/ArchTOIPipe/Kernel/toisegment.cc

@@ -10 +10 @@
 static void cout_lock() {pthread_mutex_lock(&cout_mutex);}
 static void cout_unlock() {pthread_mutex_unlock(&cout_mutex);}
-//#define LOG(_xxx_)
-// /*
+#define LOG(_xxx_)
+/*
 #define LOG(_xxx_) \
 cout_lock(); \
 _xxx_; \
 cout_unlock();
-// */
+*/
 
 /******************************/
@@ -222 +222 @@
     pthread_mutex_lock(&(master->read_wait_mutex));
     while (sn0<0 || sn >= sn0 + segmentSize*segments.size()) {
-      wait(); // must be atomic with loop test
+      wait(); // 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)
@@ -243 +243 @@
   //pthread_mutex_lock(&(master->read_wait_mutex));
   waiting = true;
+  master->waitingViews++;
   pthread_cond_wait(&(master->read_wait_condv), &(master->read_wait_mutex)); 
   waiting = false;
+  master->waitingViews--;
   //pthread_mutex_unlock(&(master->read_wait_mutex));
 }
@@ -252 +254 @@
   if (sn > firstNeeded) {
     firstNeeded = sn;
+    // C'est peut-etre le moment de faire unl sync, si on est coince par ailleurs...
+    //pthread_mutex_lock(&(master->read_wait_mutex));
+    if (sn >= sn0 + segmentSize){  //  && master->waitingViews>0) {
+//       LOG(cout<<master->name<< " sync on wontneed, waitingViews=" << master->waitingViews << endl);
+       LOG(cout<<master->name<< " sync on wontneed, sn = " << sn << " sn0 = " << sn0 << endl);
+       sync();
+    }
+    //pthread_mutex_unlock(&(master->read_wait_mutex));
   }
 }
@@ -275 +285 @@
 
   waitingOnWrite = false;
+  waitingViews = 0;
 }
 
@@ -383 +394 @@
   pthread_mutex_lock(&views_mutex);
 
-  int oldBegin = bv->sn0;
-  int oldEnd   = bv->sn0 + bv->segmentSize * bv->segments.size();
+//  int oldBegin = bv->sn0;
+//  int oldEnd   = bv->sn0 + bv->segmentSize * bv->segments.size();
+  int oldBegin = sn0;
+  int oldEnd   = sn0 + bv->segmentSize * segments.size();
 
   for (vector<BufferSegment*>::iterator i = bv->segments.begin();
@@ -402 +415 @@
     for (set<BufferView*>::iterator i = allViews.begin();
          i != allViews.end(); i++) {
+      LOG(cout << name << " View firstneeded " << (*i)->firstNeeded << endl);
       if ((*i)->firstNeeded < firstNeeded) firstNeeded = (*i)->firstNeeded;
     }
@@ -445 +459 @@
   }
 
-  if (bv->sn0 > oldBegin) { // nettoyage de fait, reveiller le writer thread si besoin
+  if (sn0 > oldBegin) { // nettoyage de fait, reveiller le writer thread si besoin
     signalWrite();
   }
@@ -451 +465 @@
   LOG(cout << name << " sync for " << hex << bv << dec << " : "
       << oldBegin << " - " << oldEnd << "  -->  "
-      << bv->sn0 << " - " << newEnd << endl);
+      << sn0 << " - " << newEnd << endl);
   
   if (newEnd > oldEnd) { // Nouveautes, reveiller les reader threads si besoin

trunk/ArchTOIPipe/Kernel/toisegment.h

@@ -139 +139 @@
 
     bool   waitingOnWrite; // wait on writer thread
+    int    waitingViews;
 
     set<BufferView*>  allViews;