Refs #9993. Move SSDP and TaskQueue thread shutdown to mythcontext.

These threads can be started by MythContext even when UPnP is otherwise disabled if we don't find a config.xml or mysql.txt so we always need to ensure that they are shutdown whenever MythContext is used.
MythTV · Aug 18, 2011 · 4a6dcb9 · 4a6dcb9
1 parent 42dfafe
commit 4a6dcb9
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 16 deletions.
diff --git a/mythtv/libs/libmyth/mythcontext.cpp b/mythtv/libs/libmyth/mythcontext.cpp
@@ -1104,6 +1104,9 @@ MythContext::~MythContext()
     MThreadPool::globalInstance()->waitForDone();
     logStop();
 
+    SSDP::Shutdown();
+    TaskQueue::Shutdown();
+
     delete gCoreContext;
     gCoreContext = NULL;
 

diff --git a/mythtv/libs/libmythupnp/ssdp.cpp b/mythtv/libs/libmythupnp/ssdp.cpp
@@ -59,6 +59,17 @@ SSDP* SSDP::Instance()
     QMutexLocker locker(&g_pSSDPCreationLock);
     return g_pSSDP ? g_pSSDP : (g_pSSDP = new SSDP());
 }
+
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+void SSDP::Shutdown()
+{
+    QMutexLocker locker(&g_pSSDPCreationLock);
+    delete g_pSSDP;
+    g_pSSDP = NULL;
+}
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -132,11 +143,7 @@ SSDP::~SSDP()
         }
     }
 
-    QMutexLocker locker(&g_pSSDPCreationLock);
-    g_pSSDP = NULL;
-
     LOG(VB_UPNP, LOG_INFO, "SSDP Thread Terminated." );
-
 }
 
 void SSDP::RequestTerminate(void)

diff --git a/mythtv/libs/libmythupnp/ssdp.h b/mythtv/libs/libmythupnp/ssdp.h
@@ -119,6 +119,7 @@ class UPNP_PUBLIC SSDP : public MThread
     public:
 
         static SSDP* Instance();
+        static void Shutdown();
 
             ~SSDP();
 

diff --git a/mythtv/libs/libmythupnp/taskqueue.cpp b/mythtv/libs/libmythupnp/taskqueue.cpp
@@ -32,6 +32,7 @@
 // Define Global instance 
 /////////////////////////////////////////////////////////////////////////////
 
+static QMutex g_pTaskQueueCreationLock;
 TaskQueue* TaskQueue::g_pTaskQueue = NULL;
 
 /////////////////////////////////////////////////////////////////////////////
@@ -75,9 +76,20 @@ Task::~Task()
 
 TaskQueue* TaskQueue::Instance()
 {
+    QMutexLocker locker(&g_pTaskQueueCreationLock);
     return g_pTaskQueue ? g_pTaskQueue : (g_pTaskQueue = new TaskQueue());
 }
 
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+void TaskQueue::Shutdown()
+{
+    QMutexLocker locker(&g_pTaskQueueCreationLock);
+    delete g_pTaskQueue;
+    g_pTaskQueue = NULL;
+}
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/mythtv/libs/libmythupnp/taskqueue.h b/mythtv/libs/libmythupnp/taskqueue.h
@@ -117,6 +117,7 @@ class UPNP_PUBLIC TaskQueue : public MThread
     public:
 
         static TaskQueue* Instance();
+        static void Shutdown();
 
         virtual ~TaskQueue();
 

diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp
@@ -229,18 +229,6 @@ namespace
             g_pUPnp = NULL;
         }
 
-        if (SSDP::Instance())
-        {
-            SSDP::Instance()->RequestTerminate();
-            SSDP::Instance()->wait();
-        }
-
-        if (TaskQueue::Instance())
-        {
-            TaskQueue::Instance()->RequestTerminate();
-            TaskQueue::Instance()->wait();
-        }
-
         if (pmanager)
         {
             delete pmanager;