Changeset 64972 in vbox

Timestamp:

Dec 21, 2016 11:38:12 AM (8 years ago)

Author:

vboxsync

Message:

Main: ThreadTask: m_hThread shouldn't be an object member

Location:

trunk/src/VBox/Main

Files:

• include/ThreadTask.h (modified) (2 diffs)
• src-all/ThreadTask.cpp (modified) (3 diffs)
• src-server/VirtualBoxImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/ThreadTask.h

@@ -35 +35 @@
 public:
     ThreadTask(const Utf8Str &t)
-        : m_hThread(NIL_RTTHREAD)
-        , m_strTaskName(t)
+        : m_strTaskName(t)
         , mAsync(false)
     { }
@@ -54 +53 @@
     static DECLCALLBACK(int) taskHandlerThreadProc(RTTHREAD thread, void *pvUser);
 
-    ThreadTask() : m_hThread(NIL_RTTHREAD), m_strTaskName("GenericTask")
+    ThreadTask() : m_strTaskName("GenericTask")
     { }
 
     /** The worker thread handle (may be invalid if the thread has shut down). */
-    RTTHREAD m_hThread;
     Utf8Str m_strTaskName;
     bool mAsync;

trunk/src/VBox/Main/src-all/ThreadTask.cpp

@@ -88 +88 @@
 HRESULT ThreadTask::createThreadInternal(RTTHREADTYPE enmType, PRTTHREAD phThread)
 {
-    int vrc = RTThreadCreate(&m_hThread,
+    RTTHREAD hThread;
+    int vrc = RTThreadCreate(&hThread,
                              taskHandlerThreadProc,
                              (void *)this,
@@ -99 +100 @@
         mAsync = true;
         if (phThread)
-            *phThread = m_hThread;
+            *phThread = hThread;
         return S_OK;
     }
@@ -124 +125 @@
     pTask->handler();
 
-    pTask->m_hThread = NIL_RTTHREAD; /* unnecessary, but whatever. */
     delete pTask;
     return VINF_SUCCESS;

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -3970 +3970 @@
 }
 
-static DECLCALLBACK(int) fntSaveMediaRegistries(RTTHREAD ThreadSelf, void *pvUser);
+static DECLCALLBACK(int) fntSaveMediaRegistries(void *pvUser);
 
 class SaveMediaRegistriesDesc : public ThreadTask
@@ -3987 +3987 @@
         try
         {
-            fntSaveMediaRegistries(m_hThread, this);
+            fntSaveMediaRegistries(this);
         }
         catch(...)
@@ -3998 +3998 @@
     ComObjPtr<VirtualBox> pVirtualBox;
 
-    friend DECLCALLBACK(int) fntSaveMediaRegistries(RTTHREAD ThreadSelf, void *pvUser);
+    friend DECLCALLBACK(int) fntSaveMediaRegistries(void *pvUser);
     friend void VirtualBox::i_saveMediaRegistry(settings::MediaRegistry &mediaRegistry,
                                                 const Guid &uuidRegistry,
@@ -4004 +4004 @@
 };
 
-DECLCALLBACK(int) fntSaveMediaRegistries(RTTHREAD ThreadSelf, void *pvUser)
-{
-    NOREF(ThreadSelf);
+DECLCALLBACK(int) fntSaveMediaRegistries(void *pvUser)
+{
     SaveMediaRegistriesDesc *pDesc = (SaveMediaRegistriesDesc *)pvUser;
     if (!pDesc)