Ticket #5481: conditional.patch

programs/mythbackend/mainserver.h

@@ -182 +182 @@
 
     QMutex deletelock;
     QMutex threadPoolLock;
+    bool poolSignal;
     QWaitCondition threadPoolCond;
     vector<ProcessRequestThread *> threadPool;
 

programs/mythbackend/mainserver.cpp

@@ -107 +107 @@
 class ProcessRequestThread : public QThread
 {
   public:
-    ProcessRequestThread(MainServer *ms) { parent = ms; }
+    ProcessRequestThread(MainServer *ms) {
+        parent = ms;
+        signalled = false;
+        socket = NULL;
+    }
    
     void setup(MythSocket *sock)
     {
         lock.lock();
         socket = sock;
         socket->UpRef();
+        signalled = true;
         waitCond.wakeOne();
         lock.unlock();
     }
@@ -122 +127 @@
     {
         lock.lock();
         threadlives = false;
+        signalled = true;
         waitCond.wakeOne();
         lock.unlock();
     }
 
     virtual void run()
     {
+        lock.lock();
         threadlives = true;
+        lock.unlock();
 
-        lock.lock();
-
-        // Signal back to the thread that created this one in case it is
-        // waiting to find out that it is up and running.
-        waitCond.wakeOne();
-
         while (1)
         {
+            lock.lock();
+            if (signalled == false) {
             waitCond.wait(&lock);
+            }
+            signalled = false;
 
-            if (!threadlives)
+            if (!socket) {
+                lock.unlock();
+                continue;
+            }
+
+            if (!threadlives) {
+                socket->DownRef();
+                socket = NULL;
+                lock.unlock();
                 break;
+            }
 
-            if (!socket)
-                continue;
-
             parent->ProcessRequest(socket);
             socket->DownRef();
             socket = NULL;
             parent->MarkUnused(this);
-        }
-
         lock.unlock();
     }
+    }
 
     QMutex lock;
     QWaitCondition waitCond;
+    bool signalled;
 
   private:
     MainServer *parent;
@@ -176 +188 @@
     ismaster = master;
     masterServer = NULL;
 
+    poolSignal = false;
+
     encoderList = tvList;
     AutoExpire::Update(true);
 
     for (int i = 0; i < PRT_STARTUP_THREAD_COUNT; i++)
     {
         ProcessRequestThread *prt = new ProcessRequestThread(this);
-        prt->lock.lock();
         prt->start();
-        prt->waitCond.wait(&prt->lock);
-        prt->lock.unlock();
         threadPool.push_back(prt);
     }
 
@@ -260 +271 @@
     if (threadPool.empty())
     {
         VERBOSE(VB_IMPORTANT, "Waiting for a process request thread..");
+        if (poolSignal == false) {
         threadPoolCond.wait(&threadPoolLock, PRT_TIMEOUT);
     }
+        poolSignal = false;
+    }
     if (!threadPool.empty())
     {
         prt = threadPool.back();
@@ -271 +285 @@
     {
         VERBOSE(VB_IMPORTANT, "Adding a new process request thread");
         prt = new ProcessRequestThread(this);
-        prt->lock.lock();
         prt->start();
-        prt->waitCond.wait(&prt->lock);
-        prt->lock.unlock();
     }
     threadPoolLock.unlock();
 
@@ -643 +654 @@
 {
     threadPoolLock.lock();
     threadPool.push_back(prt);
+    poolSignal = true;
+    threadPoolCond.wakeOne();
     threadPoolLock.unlock();
 }