Changeset 1692 in Sophya for trunk/ArchTOIPipe/Kernel/toisegment.h

Timestamp:

Oct 14, 2001, 11:15:01 PM (24 years ago)

Author:

aubourg

Message:

thread debugging

File:

• trunk/ArchTOIPipe/Kernel/toisegment.h (modified) (5 diffs)

trunk/ArchTOIPipe/Kernel/toisegment.h

@@ -27 +27 @@
   virtual void          wontNeedBefore(int i);
   virtual void          putDone();
+  virtual void          addConsumer(TOIProcessor*);
 
   // Methodes ignorees car on reimplemente les methodes de base
@@ -109 +110 @@
 
   protected:
-    void addToWaitList(BufferView* bv);
-    void removeFromWaitList(BufferView* bv);
-
 
     friend class BufferView;
+    friend class TOISegmented;
     void signalWaitingViews(); // views are waiting on read
-    void signal(); // we are waiting on write
+    void signalWrite();        // we are waiting on write
     void nextSegment();
     void waitForCleaning();
@@ -127 +126 @@
     int sn0;                         // First sn in first segment
     vector<BufferSegment*> segments; // Committed segments
+    int nConsumers;
     
     pthread_mutex_t  views_mutex; // lock for master buffer list access
-    pthread_mutex_t  write_mutex; // for write waiting
-    pthread_cond_t   condv; // waiting for cleaning (on writer thread)
+    pthread_cond_t   write_wait_condv; // waiting for cleaning (on writer thread)
     pthread_key_t    buffer_key; // thread-specific buffer view
     static void BufferDestroy(void *);
 
+    pthread_mutex_t  read_wait_mutex;
+    pthread_cond_t   read_wait_condv;
+
     bool   waitingOnWrite; // wait on writer thread
 
-    set<BufferView*>  waitingBuffers;
     set<BufferView*>  allViews;
 
@@ -158 +159 @@
     void sync();  // recupere les nouveaux segments, resync avec master
     void ensure(int sn);
-    void signal();
+
+    bool waiting;
 
     friend class MasterView;
@@ -166 +168 @@
     int segmentSize;
     int firstNeeded;
-    pthread_mutex_t  mutex; // lock pour attente de segments
-    pthread_cond_t   condv; // attente de segments (en lecture)
   };