Ticket #2019: thread_conditions.patch

libs/libmythtv/analogscan.h

@@ -35 +35 @@
 
 #include <qobject.h>
 #include <qstring.h>
+#include <qmutex.h>
+#include <qwaitcondition.h>
 #include <pthread.h>
 #include "frequencies.h"
 
@@ -90 +92 @@
     /** @brief Scanning thread*/
     pthread_t thread;
 
+    /** @brief Condition to signal that the scanning thread is running */
+    QWaitCondition scanThreadCond;
+    QMutex scanThreadCondLock;
+
     /** @brief Actual scanning proc */
     void doScan();
     /** @brief Actual thread proc , calls doScan*/

libs/libmythtv/tv_play.h

@@ -567 +567 @@
     /// runs pipnvp's NuppelVideoPlayer::StartPlaying().
     pthread_t pipdecode;
 
+    /// Condition to signal that the Event thread is up and running
+    QWaitCondition mainLoopCond;
+    QMutex mainLoopCondLock;
+
     // Constants
     static const int kInitFFRWSpeed; ///< 1x, default to normal speed
     static const int kMuteTimeout;   ///< Channel changing mute timeout in msec

libs/libmythtv/analogscan.cpp

@@ -76 +76 @@
 void AnalogScan::doScan()
 {
     fRunning = true;
+    scanThreadCondLock.lock();
+    scanThreadCond.wakeAll();
+    scanThreadCondLock.unlock();
 
     Channel         *channel = NULL;
     struct CHANLIST *flist   = NULL;
@@ -156 +159 @@
     }
 
     if (!fRunning)
+    {
+        scanThreadCondLock.lock();
         pthread_create(&thread, NULL, spawn, this);
-    while (!fRunning)
-        usleep(50);
+        scanThreadCond.wait(&scanThreadCondLock);
+        scanThreadCondLock.unlock();
+    }
+
     return true;
 }
 

libs/libmythtv/RingBuffer.cpp

@@ -629 +629 @@
 {
     readaheadrunning = false;
 
+    readAheadRunningCondLock.lock();
     pthread_create(&reader, NULL, StartReader, this);
-
-    while (!readaheadrunning)
-        usleep(50);
+    readAheadRunningCond.wait(&readAheadRunningCondLock);
+    readAheadRunningCondLock.unlock();
 }
 
 /** \fn RingBuffer::KillReadAheadThread(void)
@@ -730 +730 @@
     totfree = ReadBufFree();
 
     readaheadrunning = true;
+    readAheadRunningCondLock.lock();
+    readAheadRunningCond.wakeAll();
+    readAheadRunningCondLock.unlock();
     while (readaheadrunning)
     {
         if (pausereadthread || writemode)

libs/libmythtv/tv_play.cpp

@@ -484 +484 @@
         qApp->processEvents();
     }
 
+    mainLoopCondLock.lock();
     pthread_create(&event, NULL, EventThread, this);
+    mainLoopCond.wait(&mainLoopCondLock);
+    mainLoopCondLock.unlock();
 
-    while (!runMainLoop && !IsErrored())
-        usleep(50);
-
     return !IsErrored();
 }
 
@@ -1503 +1503 @@
     runMainLoop = true;
     exitPlayer = false;
 
+    mainLoopCondLock.lock();
+    mainLoopCond.wakeAll();
+    mainLoopCondLock.unlock();
+
     while (runMainLoop)
     {
         stateLock.lock();

libs/libmythtv/RingBuffer.h

@@ -173 +173 @@
 
     long long readAdjust;
 
+    /// Condition to signal that the read ahead thread is running
+    QWaitCondition readAheadRunningCond;
+    QMutex readAheadRunningCondLock;
+ 
     // constants
     static const uint kBufferSize;
     static const uint kReadTestSize;