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

Timestamp:

Oct 19, 2001, 2:20:38 PM (24 years ago)

Author:

aubourg

Message:

pb deadlock multiple fits readers

File:

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

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();
-*/
+// */
 
 /******************************/
@@ -23 +23 @@
 
 TOISegmented::TOISegmented(int bufsz, int maxseg) {
-  master = new MasterView(bufsz, maxseg);
+  master = new MasterView(bufsz, maxseg, "");
   setName("TOISegmented");
 }
 
 TOISegmented::TOISegmented(string nm, int bufsz, int maxseg) {
-  master = new MasterView(bufsz, maxseg);
+  master = new MasterView(bufsz, maxseg, nm);
   setName(nm);
 }
@@ -34 +34 @@
 TOISegmented::TOISegmented(char* cnm, int bufsz, int maxseg) {
   string nm = cnm;
-  master = new MasterView(bufsz, maxseg);
+  master = new MasterView(bufsz, maxseg, nm);
   setName(nm);
 }
@@ -217 +217 @@
   if (sn0 < 0 ||
       sn >= sn0 + segmentSize*segments.size()) {
-    LOG(cout << "BufferView " << hex << this << dec << ": read fault for " << sn << endl)
+    LOG(cout << master->name << " BufferView " 
+        << hex << this << dec << ": read fault for " << sn << endl)
     sync();
     pthread_mutex_lock(&(master->read_wait_mutex));
@@ -223 +224 @@
       wait(); // must be atomic with loop test
       pthread_mutex_unlock(&(master->read_wait_mutex));
-      LOG(cout << "BufferView " << hex << this << dec << ": waiting for " << sn << endl)
+      LOG(cout << master->name << " BufferView " << hex << this << dec << ": waiting for " << sn << endl)
       sync();
       pthread_mutex_lock(&(master->read_wait_mutex));
@@ -229 +230 @@
     pthread_mutex_unlock(&(master->read_wait_mutex));
 
-    LOG(cout << "BufferView " << hex << this << dec << ": resuming for " << sn 
+    LOG(cout << master->name << " BufferView " << hex << this << dec << ": resuming for " << sn 
         << " now data for " << sn0 << " - " << sn0 + segmentSize*segments.size() 
         << " in " << segments.size() << " segments " << endl)
@@ -259 +260 @@
 /*******************************/
 
-TOISegmented::MasterView::MasterView(int bufsz, int maxseg) {
+TOISegmented::MasterView::MasterView(int bufsz, int maxseg, string nm) {
   currentSegment = NULL;
   maxSegments    = maxseg;
@@ -265 +266 @@
   sn0            = -1;
   nConsumers = 0;
+  name = nm;
   
   pthread_mutex_init(&views_mutex, NULL);
@@ -296 +298 @@
         sn >= currentSegment->sn0 &&
         sn < currentSegment->sn0 + currentSegment->bufferSize)) {
-    LOG(cout << "MasterView::putData, need extend for " << sn << endl)
+    LOG(cout << name << " MasterView::putData, need extend for " << sn << endl)
     nextSegment();
   }
@@ -328 +330 @@
 void TOISegmented::MasterView::signalWrite() { /* reader thread */ /* views locked */
   if (waitingOnWrite) {
-    LOG(cout << "MasterView : signal for wait on write" << endl)
+    LOG(cout << name << " MasterView : signal for wait on write" << endl)
     pthread_cond_signal(&write_wait_condv); // only one thread can be sleeping
   }
@@ -362 +364 @@
 
 void TOISegmented::MasterView::waitForCleaning() { /* writer thread */ /* views locked */
-  LOG(cout << "MasterView : write wait for clean for " << sn0 << endl)
+  LOG(cout << name << " MasterView : write wait for clean for " << sn0 << endl)
   waitingOnWrite = true;
   checkDeadLock();
   pthread_cond_wait(&write_wait_condv, &views_mutex);
-  LOG(cout << "MasterView : wait done" << endl)
+  LOG(cout << name << " MasterView : wait done" << endl)
 }
 
@@ -403 +405 @@
     }
     
-    LOG(cout << "MasterView : firstNeeded = " << firstNeeded << endl);
+    LOG(cout << name << " MasterView : firstNeeded = " << firstNeeded << endl);
       
     vector<BufferSegment*>::iterator j = segments.begin();
@@ -447 +449 @@
   }
 
-  LOG(cout << "sync for " << hex << bv << dec << " : "
+  LOG(cout << name << " sync for " << hex << bv << dec << " : "
       << oldBegin << " - " << oldEnd << "  -->  "
       << bv->sn0 << " - " << newEnd << endl);