Changeset 63181 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 8, 2016 3:56:30 PM (8 years ago)

Author:

vboxsync

Message:

Main: warnings/cleanup

Location:

trunk/src/VBox/Main

Files:

• include/ThreadTask.h (modified) (1 diff)
• src-all/ExtPackManagerImpl.cpp (modified) (1 diff)
• src-all/ThreadTask.cpp (modified) (4 diffs)
• src-client/ClientTokenHolder.cpp (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (2 diffs)

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

@@ -33 +33 @@
 {
 public:
-    ThreadTask(const Utf8Str &t) : m_pThread(NULL), m_strTaskName(t){};
-    virtual ~ThreadTask(){};
+    ThreadTask(const Utf8Str &t) : m_pThread(NULL), m_strTaskName(t)
+    { };
+
+    virtual ~ThreadTask()
+    { };
+
     HRESULT createThread(PRTTHREAD pThread = NULL, RTTHREADTYPE enmType = RTTHREADTYPE_MAIN_WORKER);
+
     virtual void handler() = 0;
-    static DECLCALLBACK(int) taskHandler(RTTHREAD thread, void *pvUser);
-
     inline Utf8Str getTaskName() const {return m_strTaskName;};
 
 protected:
+    static DECLCALLBACK(int) taskHandlerThreadProc(RTTHREAD thread, void *pvUser);
+
     ThreadTask():m_pThread(NULL), m_strTaskName("GenericTask"){};
+
     PRTTHREAD m_pThread;
     Utf8Str m_strTaskName;

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

@@ -660 +660 @@
             {
                 ComPtr<Progress> ptrProgress = pTask->ptrProgress;
-                hrc = pTask->createThread(NULL, RTTHREADTYPE_DEFAULT);
+                hrc = pTask->createThread(NULL /*phThread*/, RTTHREADTYPE_DEFAULT);
                 pTask = NULL; /* The _completely_ _undocumented_ createThread method always consumes pTask. */
                 if (SUCCEEDED(hrc))

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

@@ -21 +21 @@
 
 /**
- *  The function takes ownership of "this" instance (object
- *  instance which calls this function).
- *  And the function is responsible for deletion of "this"
- *  pointer in all cases.
- *  Possible way of usage:
+ * Starts the task (on separate thread), consuming @a this.
  *
- *  int vrc = VINF_SUCCESS;
- *  HRESULT hr = S_OK;
+ * The function takes ownership of "this" instance (object instance which calls
+ * this function). And the function is responsible for deletion of "this"
+ * pointer in all cases.
  *
- *  SomeTaskInheritedFromThreadTask* pTask = NULL;
- *  try
- *  {
- *      pTask = new SomeTaskInheritedFromThreadTask(this);
- *      if (!pTask->Init())//some init procedure
- *      {
- *          delete pTask;
- *          throw E_FAIL;
- *      }
- *      //this function delete pTask in case of exceptions, so
- *      there is no need the call of delete operator
+ * Possible way of usage:
  *
- *      hr = pTask->createThread();
- *  }
- *  catch(...)
- *  {
- *      vrc = E_FAIL;
- *  }
+ * @code{.cpp}
+ * int vrc = VINF_SUCCESS;
+ * HRESULT hr = S_OK;
+ *
+ * SomeTaskInheritedFromThreadTask* pTask = NULL;
+ * try
+ * {
+ *     pTask = new SomeTaskInheritedFromThreadTask(this);
+ *     if (!pTask->Init())//some init procedure
+ *     {
+ *         delete pTask;
+ *         throw E_FAIL;
+ *     }
+ *     //this function delete pTask in case of exceptions, so
+ *     there is no need the call of delete operator
+ *
+ *     hr = pTask->createThread();
+ * }
+ * catch(...)
+ * {
+ *     vrc = E_FAIL;
+ * }
+ * @endcode
  */
-HRESULT ThreadTask::createThread(PRTTHREAD pThread, RTTHREADTYPE enmType)
+HRESULT ThreadTask::createThread(PRTTHREAD pThread /*= NULL*/, RTTHREADTYPE enmType /*= RTTHREADTYPE_MAIN_WORKER*/)
 {
-    HRESULT rc = S_OK;
-
     m_pThread = pThread;
     int vrc = RTThreadCreate(m_pThread,
-                             taskHandler,
+                             taskHandlerThreadProc,
                              (void *)this,
                              0,
@@ -61 +63 @@
                              0,
                              this->getTaskName().c_str());
+    if (RT_SUCCESS(vrc))
+        return S_OK;
 
-    if (RT_FAILURE(vrc))
-    {
-        delete this;
-        return E_FAIL;
-    }
-
-    return rc;
+    delete this;
+    return E_FAIL;
 }
 
@@ -75 +74 @@
  * thread started for a Task.
  */
-/* static */ DECLCALLBACK(int) ThreadTask::taskHandler(RTTHREAD /* thread */, void *pvUser)
+/* static */ DECLCALLBACK(int) ThreadTask::taskHandlerThreadProc(RTTHREAD /* thread */, void *pvUser)
 {
     if (pvUser == NULL)
-        return VERR_INVALID_POINTER;
+        return VERR_INVALID_POINTER; /* nobody cares */
 
     ThreadTask *pTask = static_cast<ThreadTask *>(pvUser);
@@ -88 +87 @@
 
     delete pTask;
-
     return VINF_SUCCESS;
 }
+

trunk/src/VBox/Main/src-client/ClientTokenHolder.cpp

@@ -271 +271 @@
                 /* release the token */
                 LogFlow(("ClientTokenHolderThread(): releasing token...\n"));
-                BOOL success = ::ReleaseMutex(mutex);
-                AssertMsg(success, ("cannot release token, err=%d\n", ::GetLastError()));
+                BOOL fRc = ::ReleaseMutex(mutex);
+                AssertMsg(fRc, ("cannot release token, err=%d\n", ::GetLastError())); NOREF(fRc);
                 ::CloseHandle(mutex);
                 ::CloseHandle(finishSem);

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

@@ -2553 +2553 @@
     HRESULT hr = S_OK;
     StartSVCHelperClientData *pTask = NULL;
-    RTTHREAD tid = NIL_RTTHREAD;
     try
     {
@@ -2568 +2567 @@
 
         //this function delete pTask in case of exceptions, so there is no need in the call of delete operator
-        hr = pTask->createThread(&tid, RTTHREADTYPE_MAIN_WORKER);
+        hr = pTask->createThread(NULL, RTTHREADTYPE_MAIN_WORKER);
 
     }