cec: fixed - ensure that the correct libCEC version is set after initialising the...

[deb_libcec.git] / src / lib / platform / threads / threads.h

diff --git a/src/lib/platform/threads/threads.h b/src/lib/platform/threads/threads.h
index f2de310a23749f7960ef3882008c61e317c5eeb9..ead0ebdcb18c5e53525f60bb1882cdf9f12fabe6 100644 (file)
--- a/src/lib/platform/threads/threads.h
+++ b/src/lib/platform/threads/threads.h
@@ -41,11 +41,18 @@ namespace PLATFORM
     CThread(void) :
         m_bStop(false),
         m_bRunning(false),
-        m_bStopped(false) {}
+        m_bStopped(false),
+        m_thread(NULL) {}
 
     virtual ~CThread(void)
     {
-      StopThread();
+      StopThread(0);
+      void *retVal;
+      if (m_thread)
+        ThreadsWait(m_thread, &retVal);
+      #if defined(__WINDOWS__)
+      (void *)retVal; //"unreferenced local variable" warning
+      #endif
     }
 
     static void *ThreadHandler(CThread *thread)
@@ -88,22 +95,26 @@ namespace PLATFORM
 
     virtual bool CreateThread(bool bWait = true)
     {
-        bool bReturn(false);
-        CLockObject lock(m_threadMutex);
-        if (!IsRunning())
+      bool bReturn(false);
+      CLockObject lock(m_threadMutex);
+      if (!IsRunning())
+      {
+        m_bStop = false;
+        if (ThreadsCreate(m_thread, CThread::ThreadHandler, ((void*)static_cast<CThread *>(this))))
         {
-          m_bStop = false;
-          if (ThreadsCreate(m_thread, CThread::ThreadHandler, ((void*)static_cast<CThread *>(this))))
-          {
-            if (bWait)
-              m_threadCondition.Wait(m_threadMutex, m_bRunning);
-            bReturn = true;
-          }
+          if (bWait)
+            m_threadCondition.Wait(m_threadMutex, m_bRunning);
+          bReturn = true;
         }
+      }
       return bReturn;
     }
 
-    virtual bool StopThread(bool bWaitForExit = true)
+    /*!
+     * @brief Stop the thread
+     * @param iWaitMs negative = don't wait, 0 = infinite, or the amount of ms to wait
+     */
+    virtual bool StopThread(int iWaitMs = 5000)
     {
       bool bReturn(true);
       bool bRunning(false);
@@ -113,12 +124,17 @@ namespace PLATFORM
         m_bStop = true;
       }
 
-      if (bRunning && bWaitForExit)
+      if (bRunning && iWaitMs >= 0)
       {
-        void *retVal = NULL;
-        bReturn = ThreadsWait(m_thread, &retVal);
+        CLockObject lock(m_threadMutex);
+        bReturn = m_threadCondition.Wait(m_threadMutex, m_bStopped, iWaitMs);
       }
-      return true;
+      else
+      {
+        bReturn = true;
+      }
+
+      return bReturn;
     }
 
     virtual bool Sleep(uint32_t iTimeout)
@@ -131,13 +147,13 @@ namespace PLATFORM
 
   protected:
     void SetRunning(bool bSetTo);
+    CMutex           m_threadMutex;
 
   private:
-    bool               m_bStop;
-    bool               m_bRunning;
-    bool               m_bStopped;
-    CCondition<bool &> m_threadCondition;
-    CMutex             m_threadMutex;
-    thread_t           m_thread;
+    bool             m_bStop;
+    bool             m_bRunning;
+    bool             m_bStopped;
+    CCondition<bool> m_threadCondition;
+    thread_t         m_thread;
   };
 };