Changeset 2052 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 12, 2007 4:00:24 PM (18 years ago)

Author:

vboxsync

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

20356

Message:

Make named pipe destruction independent of driver destruction order.

File:

• trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp

@@ -553 +553 @@
     LogFlow(("%s: %s\n", __FUNCTION__, pData->pszLocation));
 
+    if (pData->ListenThread)
+    {
+        RTThreadWait(pData->ListenThread, 250, NULL);
+        if (pData->ListenThread != NIL_RTTHREAD)
+            LogRel(("NamedPipe%d: listen thread did not terminate\n", pDrvIns->iInstance));
+    }
+
+    if (pData->pszLocation)
+        MMR3HeapFree(pData->pszLocation);
+}
+
+
+/**
+ * Power off a named pipe stream driver instance.
+ *
+ * This does most of the destruction work, to avoid ordering dependencies.
+ *
+ * @param   pDrvIns     The driver instance data.
+ */
+static DECLCALLBACK(void) drvNamedPipePowerOff(PPDMDRVINS pDrvIns)
+{
+    PDRVNAMEDPIPE pData = PDMINS2DATA(pDrvIns, PDRVNAMEDPIPE);
+    LogFlow(("%s: %s\n", __FUNCTION__, pData->pszLocation));
+
     pData->fShutdown = true;
 
@@ -584 +608 @@
     }
 #endif /* !__WIN__ */
-
-    if (pData->ListenThread)
-    {
-        RTThreadWait(pData->ListenThread, 250, NULL);
-        if (pData->ListenThread != NIL_RTTHREAD)
-            LogRel(("NamedPipe%d: listen thread did not terminate\n", pDrvIns->iInstance));
-    }
-
-    if (pData->pszLocation)
-        MMR3HeapFree(pData->pszLocation);
 }
 
@@ -633 +647 @@
     NULL,
     /* pfnPowerOff */
-    NULL
+    drvNamedPipePowerOff,
 };