Changeset 12324 in vbox for trunk/src

Timestamp:

Sep 10, 2008 5:18:38 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

36345

Message:

PDMThread: New API PDMR3ThreadSleep. Fixed a per thread event sem leak.

Location:

trunk/src/VBox/VMM

Files:

• PDMInternal.h (modified) (1 diff)
• PDMThread.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PDMInternal.h

@@ -246 +246 @@
     /** The VM pointer. */
     PVMR3                           pVM;
-    /** The event semaphore the thread blocks on. */
+    /** The event semaphore the thread blocks on when not running. */
     RTSEMEVENTMULTI                 BlockEvent;
+    /** The event semaphore the thread sleeps on while running. */
+    RTSEMEVENTMULTI                 SleepEvent;
     /** Pointer to the next thread. */
     R3PTRTYPE(struct PDMTHREAD *)   pNext;

trunk/src/VBox/VMM/PDMThread.cpp

@@ -62 +62 @@
 static DECLCALLBACK(int) pdmR3ThreadWakeUp(PPDMTHREAD pThread)
 {
+    RTSemEventMultiSignal(pThread->Internal.s.SleepEvent);
+
     int rc;
     switch (pThread->Internal.s.enmType)
@@ -142 +144 @@
     if (RT_SUCCESS(rc))
     {
-        /*
-         * Create the thread and wait for it to initialize.
-         * The newly created thread will set the PDMTHREAD::Thread member.
-         */
-        RTTHREAD Thread;
-        rc = RTThreadCreate(&Thread, pdmR3ThreadMain, pThread, cbStack, enmType, RTTHREADFLAGS_WAITABLE, pszName);
+        rc = RTSemEventMultiCreate(&pThread->Internal.s.SleepEvent);
         if (RT_SUCCESS(rc))
         {
-            rc = RTThreadUserWait(Thread, 60*1000);
-            if (    RT_SUCCESS(rc)
-                &&  pThread->enmState != PDMTHREADSTATE_SUSPENDED)
-                rc = VERR_INTERNAL_ERROR;
+            /*
+             * Create the thread and wait for it to initialize.
+             * The newly created thread will set the PDMTHREAD::Thread member.
+             */
+            RTTHREAD Thread;
+            rc = RTThreadCreate(&Thread, pdmR3ThreadMain, pThread, cbStack, enmType, RTTHREADFLAGS_WAITABLE, pszName);
             if (RT_SUCCESS(rc))
             {
-                /*
-                 * Insert it into the thread list.
-                 */
-                pThread->Internal.s.pNext = NULL;
-                if (pVM->pdm.s.pThreadsTail)
-                    pVM->pdm.s.pThreadsTail->Internal.s.pNext = pThread;
-                else
-                    pVM->pdm.s.pThreads = pThread;
-                pVM->pdm.s.pThreadsTail = pThread;
-
-                rc = RTThreadUserReset(Thread);
-                AssertRC(rc);
-                return rc;
+                rc = RTThreadUserWait(Thread, 60*1000);
+                if (    RT_SUCCESS(rc)
+                    &&  pThread->enmState != PDMTHREADSTATE_SUSPENDED)
+                    rc = VERR_INTERNAL_ERROR;
+                if (RT_SUCCESS(rc))
+                {
+                    /*
+                     * Insert it into the thread list.
+                     */
+                    pThread->Internal.s.pNext = NULL;
+                    if (pVM->pdm.s.pThreadsTail)
+                        pVM->pdm.s.pThreadsTail->Internal.s.pNext = pThread;
+                    else
+                        pVM->pdm.s.pThreads = pThread;
+                    pVM->pdm.s.pThreadsTail = pThread;
+
+                    rc = RTThreadUserReset(Thread);
+                    AssertRC(rc);
+                    return rc;
+                }
+
+                /* bailout */
+                RTThreadWait(Thread, 60*1000, NULL);
             }
-
-            /* bailout */
-            RTThreadWait(Thread, 60*1000, NULL);
+            RTSemEventMultiDestroy(pThread->Internal.s.SleepEvent);
+            pThread->Internal.s.SleepEvent = NIL_RTSEMEVENTMULTI;
         }
         RTSemEventMultiDestroy(pThread->Internal.s.BlockEvent);
@@ -435 +443 @@
         pThread->Internal.s.pNext = NULL;
 
-        /* free it */
+        /* free the resources */
+        RTSemEventMultiDestroy(pThread->Internal.s.BlockEvent);
+        pThread->Internal.s.BlockEvent = NIL_RTSEMEVENTMULTI;
+
+        RTSemEventMultiDestroy(pThread->Internal.s.SleepEvent);
+        pThread->Internal.s.SleepEvent = NIL_RTSEMEVENTMULTI;
+
         MMR3HeapFree(pThread);
     }
@@ -677 +691 @@
     pdmR3ThreadBailMeOut(pThread);
     return rc;
+}
+
+
+/**
+ * Called by the PDM thread instead of RTThreadSleep.
+ *
+ * The difference is that the sleep will be interrupted on state change. The
+ * thread must be in the running state, otherwise it will return immediately.
+ *
+ * @returns VBox status code.
+ * @retval  VINF_SUCCESS on success or state change.
+ * @retval  VERR_INTERRUPTED on signal or APC.
+ *
+ * @param   pThread     The PDM thread.
+ * @param   cMillies    The number of milliseconds to sleep.
+ */
+PDMR3DECL(int) PDMR3ThreadSleep(PPDMTHREAD pThread, unsigned cMillies)
+{
+    /*
+     * Assert sanity.
+     */
+    AssertReturn(pThread->enmState > PDMTHREADSTATE_INVALID && pThread->enmState < PDMTHREADSTATE_TERMINATED, VERR_INTERNAL_ERROR);
+    AssertReturn(pThread->Thread == RTThreadSelf(), VERR_INTERNAL_ERROR);
+
+    /*
+     * Reset the event semaphore, check the state and sleep.
+     */
+    RTSemEventMultiReset(pThread->Internal.s.SleepEvent);
+    if (pThread->enmState != PDMTHREADSTATE_RUNNING)
+        return VINF_SUCCESS;
+    return RTSemEventMultiWaitNoResume(pThread->Internal.s.SleepEvent, cMillies);
 }