소스 검색

all ConditionVar::wait() methods need to be BLOCKING

David Rose 13 년 전
부모
커밋
81caaa764b
3개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 2 2
      panda/src/pipeline/conditionVarDebug.h
  2. 2 2
      panda/src/pipeline/conditionVarFullDebug.h
  3. 2 2
      panda/src/pipeline/conditionVarFullDirect.h

+ 2 - 2
panda/src/pipeline/conditionVarDebug.h

@@ -44,8 +44,8 @@ private:
 PUBLISHED:
 PUBLISHED:
   INLINE MutexDebug &get_mutex() const;
   INLINE MutexDebug &get_mutex() const;
 
 
-  void wait();
-  void wait(double timeout);
+  BLOCKING void wait();
+  BLOCKING void wait(double timeout);
   void notify();
   void notify();
   virtual void output(ostream &out) const;
   virtual void output(ostream &out) const;
 
 

+ 2 - 2
panda/src/pipeline/conditionVarFullDebug.h

@@ -44,8 +44,8 @@ private:
 PUBLISHED:
 PUBLISHED:
   INLINE MutexDebug &get_mutex() const;
   INLINE MutexDebug &get_mutex() const;
 
 
-  void wait();
-  void wait(double timeout);
+  BLOCKING void wait();
+  BLOCKING void wait(double timeout);
   void notify();
   void notify();
   void notify_all();
   void notify_all();
   virtual void output(ostream &out) const;
   virtual void output(ostream &out) const;

+ 2 - 2
panda/src/pipeline/conditionVarFullDirect.h

@@ -44,8 +44,8 @@ private:
 PUBLISHED:
 PUBLISHED:
   INLINE MutexDirect &get_mutex() const;
   INLINE MutexDirect &get_mutex() const;
 
 
-  INLINE void wait();
-  INLINE void wait(double timeout);
+  BLOCKING INLINE void wait();
+  BLOCKING INLINE void wait(double timeout);
   INLINE void notify();
   INLINE void notify();
   INLINE void notify_all();
   INLINE void notify_all();
   void output(ostream &out) const;
   void output(ostream &out) const;