Changeset 1778 in vbox

Timestamp:

Mar 28, 2007 3:17:57 PM (18 years ago)

Author:

vboxsync

Message:

Clean up listen thread properly.

File:

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

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

@@ -37 +37 @@
 #include <iprt/alloc.h>
 #include <iprt/string.h>
+#include <iprt/semaphore.h>
 
 #include "Builtins.h"
@@ -83 +84 @@
     /* Overlapped structure for reads. */
     OVERLAPPED          OverlappedRead;
+    /* Listen thread wakeup semaphore */
+    RTSEMEVENT          ListenSem;
 #else /* !__WIN__ */
     /** Socket handle of the local socket for server. */
@@ -356 +359 @@
             if (hrc == ERROR_PIPE_CONNECTED)
             {
-                RTThreadSleep(250);
+                RTSemEventWait(pData->ListenSem, 250);
             }
             else
@@ -396 +399 @@
     CloseHandle(hEvent);
 #endif
+    pData->ListenThread = NIL_RTTHREAD;
     return VINF_SUCCESS;
 }
@@ -474 +478 @@
         if VBOX_FAILURE(rc)
             return PDMDrvHlpVMSetError(pDrvIns, rc,  RT_SRC_POS, N_("NamedPipe#%d failed to create listening thread\n"), pDrvIns->iInstance);
+
+        rc = RTSemEventCreate(&pData->ListenSem);
+        AssertRC(rc);
     }
     else
@@ -487 +494 @@
     pData->OverlappedWrite.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
     pData->OverlappedRead.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-
 #else /* !__WIN__ */
     int s;
@@ -561 +567 @@
         CloseHandle(pData->OverlappedWrite.hEvent);
     }
+    /* Wake up listen thread */
+    RTSemEventSignal(pData->ListenSem);
+    RTSemEventDestroy(pData->ListenSem);
 #else /* !__WIN__ */
     if (pData->fIsServer)
@@ -575 +584 @@
     }
 #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);