Changeset 4455 in vbox for trunk/src

Timestamp:

Aug 30, 2007 9:57:57 PM (17 years ago)

Author:

vboxsync

Message:

Fixed PDMTHREAD::Thread initialiation race, the new thread might finish before it was set by EMT.

File:

• trunk/src/VBox/VMM/PDMThread.cpp (modified) (14 diffs)

trunk/src/VBox/VMM/PDMThread.cpp

@@ -64 +64 @@
             rc = pThread->u.Dev.pfnWakeUp(pThread->u.Dev.pDevIns, pThread);
             break;
-            
+
         case PDMTHREADTYPE_USB:
             rc = pThread->u.Usb.pfnWakeUp(pThread->u.Usb.pUsbIns, pThread);
@@ -140 +140 @@
         /*
          * Create the thread and wait for it to initialize.
+         * The newly created thread will set the PDMTHREAD::Thread member.
          */
-        rc = RTThreadCreate(&pThread->Thread, pdmR3ThreadMain, pThread, cbStack, enmType, RTTHREADFLAGS_WAITABLE, pszName);
+        RTTHREAD Thread;
+        rc = RTThreadCreate(&Thread, pdmR3ThreadMain, pThread, cbStack, enmType, RTTHREADFLAGS_WAITABLE, pszName);
         if (RT_SUCCESS(rc))
         {
-            rc = RTThreadUserWait(pThread->Thread, 60*1000);
+            rc = RTThreadUserWait(Thread, 60*1000);
             if (    RT_SUCCESS(rc)
                 &&  pThread->enmState != PDMTHREADSTATE_SUSPENDED)
@@ -160 +162 @@
                 pVM->pdm.s.pThreadsTail = pThread;
 
-                rc = RTThreadUserReset(pThread->Thread);
+                rc = RTThreadUserReset(Thread);
                 AssertRC(rc);
                 return rc;
@@ -166 +168 @@
 
             /* bailout */
-            RTThreadWait(pThread->Thread, 60*1000, NULL);
+            RTThreadWait(Thread, 60*1000, NULL);
         }
         RTSemEventMultiDestroy(pThread->Internal.s.BlockEvent);
@@ -180 +182 @@
 /**
  * Device Helper for creating a thread associated with a device.
- * 
- * @returns VBox status code.
- * @param   pVM         The VM handle. 
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM handle.
  * @param   pDevIns     The device instance.
  * @param   ppThread    Where to store the thread 'handle'.
@@ -212 +214 @@
 /**
  * USB Device Helper for creating a thread associated with an USB device.
- * 
- * @returns VBox status code.
- * @param   pVM         The VM handle. 
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM handle.
  * @param   pUsbIns     The USB device instance.
  * @param   ppThread    Where to store the thread 'handle'.
@@ -244 +246 @@
 /**
  * Driver Helper for creating a thread associated with a driver.
- * 
- * @returns VBox status code.
- * @param   pVM         The VM handle. 
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM handle.
  * @param   pDrvIns     The driver instance.
  * @param   ppThread    Where to store the thread 'handle'.
@@ -276 +278 @@
 /**
  * Creates a PDM thread for internal use in the VM.
- * 
- * @returns VBox status code.
- * @param   pVM         The VM handle. 
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM handle.
  * @param   ppThread    Where to store the thread 'handle'.
  * @param   pvUser      The user argument to the thread function.
@@ -306 +308 @@
 /**
  * Creates a PDM thread for VM use by some external party.
- * 
- * @returns VBox status code.
- * @param   pVM         The VM handle. 
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM handle.
  * @param   ppThread    Where to store the thread 'handle'.
  * @param   pvUser      The user argument to the thread function.
@@ -442 +444 @@
  * Destroys all threads associated with a device.
  *
- * This function is called by PDMDevice when a device is 
+ * This function is called by PDMDevice when a device is
  * destroyed (not currently implemented).
- * 
+ *
  * @returns VBox status code of the first failure.
  * @param   pVM         The VM handle.
@@ -476 +478 @@
  *
  * This function is called by PDMUsb when a device is destroyed.
- * 
+ *
  * @returns VBox status code of the first failure.
  * @param   pVM         The VM handle.
@@ -508 +510 @@
  *
  * This function is called by PDMDriver when a driver is destroyed.
- * 
+ *
  * @returns VBox status code of the first failure.
  * @param   pVM         The VM handle.
@@ -686 +688 @@
     PPDMTHREAD pThread = (PPDMTHREAD)pvUser;
     Log(("PDMThread: Initializing thread %RTthrd / %p / '%s'...\n", Thread, pThread, RTThreadGetName(Thread)));
+    pThread->Thread = Thread;
 
     /*
@@ -820 +823 @@
  * PDM thread a bit early. The thread will be automatically suspend upon
  * completion of the device/driver notification cycle.
- * 
+ *
  * The caller is responsible for serializing the control operations on the
  * thread. That basically means, always do these calls from the EMT.