Changeset 1437 in Sophya for trunk/ArchTOIPipe/Kernel/toi.h

Timestamp:

Mar 12, 2001, 7:00:28 PM (25 years ago)

Author:

ansari

Message:

Protections diverses dans TOIProcessor et FITSTOIReader/Writer
Ajout d'un TOI (TOISeqBuffered) avec gestion d'un buffer entre put/get
Ajout de processeurs de test (RZTOIProc...) , programme test associe
et SMakefile (pour compil avec SOPHYA)

Reza 12/3/2001

File:

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

trunk/ArchTOIPipe/Kernel/toi.h

@@ -26 +26 @@
   TOI(string name);
   virtual ~TOI();
+
+  //   ----- Rajouts Reza 12/3/2001
+  virtual void PrintStatus(ostream & os) const;
+  //  Fin rajouts Reza 12/3/2001 ------
 
 #ifdef WITH_SOPHYA
@@ -55 +59 @@
 
   void setName(string n) {name =n;}
-  string getName() {return name;}
+  string getName() const {return name;}
 
 protected:
   TOI*                  errorTOI;
   pthread_mutex_t       mutex;
+  //   ----- Rajouts Reza 12/3/2001
+  pthread_cond_t        condv;
+  bool                  fgwaitput;
+  bool                  fgwaitget;
+  bool                  fgsigput;
+  bool                  fgsigget;
+  int                   countwaitput;
+  int                   countwaitget;
+  //  Fin rajouts Reza 12/3/2001 ------
+
   TOIProcessor*         producer;
   vector<TOIProcessor*> consumers;
@@ -86 +100 @@
   void  TOIInit();
 
+  // Il faut faire attention avec mutex et condv, si TOI cree sur le stack !
+  // Il faut donc faire new TOI  -    Reza 11/3/2001
   void lock() {pthread_mutex_lock(&mutex);}
   void unlock() {pthread_mutex_unlock(&mutex);}
 
+  //   ----- Rajouts Reza 12/3/2001
+  void wait() {pthread_cond_wait(&condv, &mutex);}
+  void signal() {pthread_cond_signal(&condv);}
+  void broadcast() {pthread_cond_broadcast(&condv);}
+  inline void waitPut() 
+    {fgwaitput=true; countwaitput++; pthread_cond_wait(&condv, &mutex);}
+  inline void waitGet() 
+    {fgwaitget=true; countwaitget++; pthread_cond_wait(&condv, &mutex);}
+  inline bool isPutWaiting() const { return fgwaitput; }
+  inline bool isGetWaiting() const { return fgwaitget; }
+  inline void signalPut() {fgsigput=true;}
+  inline void signalGet() {fgsigget=true;}
+  inline void cleanWaitPut() { fgsigput = fgwaitput = false; }
+  inline void cleanWaitGet() { fgsigget = fgwaitget = false; }
+
+public:
+  inline int  getCountWaitPut() const { return countwaitput; }
+  inline int  getCountWaitGet() const { return countwaitget; }
+  //  Fin rajouts Reza 12/3/2001 ------
+
 };
+
+inline ostream & operator << (ostream & os, TOI const & toi)
+{ toi.PrintStatus(os); return os; }
 
 class TOIRegular : public TOI {
@@ -101 +140 @@
   TOIRegularWindow();
   TOIRegularWindow(string nm);
-  ~TOIRegularWindow();
+  virtual ~TOIRegularWindow();
 
   virtual DataStatus isDataAvailNL(int iStart, int iEnd);
@@ -112 +151 @@
   long          i0;
   double defaultValue;
-  
+ 
 #ifdef WITH_SOPHYA
   virtual Array         doGetData(int iStart, int iEnd);