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

Timestamp:

Oct 12, 2001, 1:17:10 AM (24 years ago)

Author:

aubourg

Message:

* empty log message *

File:

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

trunk/ArchTOIPipe/Kernel/toisegment.h

@@ -67 +67 @@
 
     int refcount;    // Nombre de vues qui utilisent 
-    pthread_mutex_t refcount_mutex;
+    pthread_mutex_t refcount_mutex; // Pour modification refcount
 
     double* data;
     uint_8* flags;
+
+    friend class BufferView;
+    friend class MasterView;
   };
   
@@ -80 +83 @@
 
     void putData(int sn, double data, uint_8 flag);
+    double getData(int sn);
+    uint_8 getFlag(int sn);
+
+  protected:
     void addToWaitList(BufferView* bv);
+    void removeFromWaitList(BufferView* bv);
 
     BufferView* getView(); // thread-specific
 
-  protected:
     friend class BufferView;
     void signalWaitingViews();
@@ -94 +101 @@
 
     int maxSegments;
-    int bufferSize;
-    int sn0;                // First sn in first buffer
-    vector<BufferSegment*> segments; // Committed
+    int segmentSize;
+    int sn0;                         // First sn in first segment
+    vector<BufferSegment*> segments; // Committed segments
     
-    pthread_mutex_t  mutex; // lock for master buffer list access
-    pthread_cond_t   condv; // waiting (read or write)
+    pthread_mutex_t  views_mutex; // lock for master buffer list access
+    pthread_mutex_t  write_mutex; // for write waiting
+    pthread_cond_t   condv; // waiting (read or write) (write only ?)
+    pthread_key_t    buffer_key; // thread-specific buffer view
+    static void BufferDestroy(void *);
 
     static const int NO_WAIT   = 0;
@@ -107 +117 @@
 
     set<BufferView*>  waitingBuffers;
+
+    void checkDeadLock();
   };
 
@@ -113 +125 @@
   class BufferView {
   public:
-    BufferView();
+    BufferView(MasterView*);
     ~BufferView();
+
+    double getData(int sn);
+    uint_8 getFlag(int sn);    
     
+  protected:
+    void wait();  // Passe en attente d'un nouveau segment -- lecture
     void sync();  // recupere les nouveaux segments, resync avec master
-    void wait();  // Passe en attente d'un nouveau segment
-  protected:
+    void ensure(int sn);
+    void signal();
+
     friend class MasterView;
     MasterView* master;
     vector<BufferSegment*> segments; // Committed
+    int sn0; 
+    int segmentSize;
     pthread_mutex_t  mutex; // lock pour attente de segments
-    pthread_cond_t   condv; // attente de segments
+    pthread_cond_t   condv; // attente de segments (en lecture)
   };  
 
@@ -130 +150 @@
 };
 
-// Inline methods
+/***********************************/
+/* Inline methods -- BufferSegment */
+/***********************************/
 
 double TOISegmented::BufferSegment::getData(int sn) {