Changeset 1788 in vbox for trunk/src/VBox

Timestamp:

Mar 29, 2007 8:02:32 AM (18 years ago)

Author:

vboxsync

Message:

Implemented hgcmThreadWait.

Location:

trunk/src/VBox/Main

Files:

• hgcm/HGCM.cpp (modified) (2 diffs)
• hgcm/HGCMObjects.cpp (modified) (1 diff)
• hgcm/HGCMThread.cpp (modified) (5 diffs)
• include/hgcm/HGCMThread.h (modified) (1 diff)

trunk/src/VBox/Main/hgcm/HGCM.cpp

@@ -699 +699 @@
     {
         rc = hgcmMsgSend (hMsg);
+
+        if (VBOX_SUCCESS (rc))
+        {
+            hgcmThreadWait (m_thread);
+        }
     }
 
@@ -1947 +1952 @@
             if (VBOX_SUCCESS (rc))
             {
+                /* Wait for the thread termination. */
+                hgcmThreadWait (g_hgcmThread);
+
                 hgcmThreadUninit ();
             }

trunk/src/VBox/Main/hgcm/HGCMObjects.cpp

@@ -209 +209 @@
             hgcmObjLeave ();
         }
-        else if (rc == VERR_SEM_DESTROYED)
-        {
-            /* @todo Implement hgcmThreadWait. */
-        }
         else
         {

trunk/src/VBox/Main/hgcm/HGCMThread.cpp

@@ -135 +135 @@
         HGCMThread ();
 
+        int WaitForTermination (void);
+
         int Initialize (HGCMTHREADHANDLE handle, const char *pszThreadName, PFNHGCMTHREAD pfnThread, void *pvUser);
 
@@ -199 +201 @@
 
     hgcmObjDeleteHandle (pThread->Handle ());
+
+    pThread->m_thread = NIL_RTTHREAD;
 
     LogFlow(("MAIN::hgcmWorkerThreadFunc: completed HGCM thread %p\n", pThread));
@@ -231 +235 @@
      */
 
+    Assert(m_thread == NIL_RTTHREAD);
+
     if (RTCritSectIsInitialized (&m_critsect))
     {
@@ -246 +252 @@
     }
 
-    /*
-     * Wait for the thread to terminate, but let's not wait forever.
-     */
-    if (     m_thread != NIL_RTTHREAD
-        && !(m_fu32ThreadFlags & HGCMMSG_TF_TERMINATED))
-    {
-        int rc = RTThreadWait (m_thread, 5000, NULL);
-        AssertRC (rc);
-    }
-
     return;
+}
+
+int HGCMThread::WaitForTermination (void)
+{
+    int rc = VINF_SUCCESS;
+    LogFlowFunc(("\n"));
+
+    if (m_thread != NIL_RTTHREAD)
+    {
+        rc = RTThreadWait (m_thread, 5000, NULL);
+    }
+
+    LogFlowFunc(("rc = %Vrc\n", rc));
+    return rc;
 }
 
@@ -648 +658 @@
 }
 
+int hgcmThreadWait (HGCMTHREADHANDLE hThread)
+{
+    int rc = VERR_INVALID_HANDLE;
+    LogFlowFunc(("0x%08X\n", hThread));
+
+    HGCMThread *pThread = (HGCMThread *)hgcmObjReference (hThread, HGCMOBJ_THREAD);
+
+    if (pThread)
+    {
+        rc = pThread->WaitForTermination ();
+
+        hgcmObjDereference (pThread);
+    }
+
+    LogFlowFunc(("rc = %Vrc\n", rc));
+    return rc;
+}
+
 int hgcmMsgAlloc (HGCMTHREADHANDLE hThread, HGCMMSGHANDLE *pHandle, uint32_t u32MsgId, PFNHGCMNEWMSGALLOC pfnNewMessage)
 {

trunk/src/VBox/Main/include/hgcm/HGCMThread.h

@@ -138 +138 @@
 int hgcmThreadCreate (HGCMTHREADHANDLE *pHandle, const char *pszThreadName, PFNHGCMTHREAD pfnThread, void *pvUser);
 
+/** Wait for termination of a HGCM worker thread.
+ *
+ * @param handle The HGCM thread handle.
+ *
+ * @return VBox error code
+ */
+int hgcmThreadWait (HGCMTHREADHANDLE handle);
+
 /** Allocate a message to be posted to HGCM worker thread.
  *