Changeset 12351 in vbox

Timestamp:

Sep 10, 2008 1:00:40 PM (16 years ago)

Author:

vboxsync

Message:

Host serial: Fix a bug which could cause a thread to exit after resuming a VM (Windows hosts only)

File:

• trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp (modified) (6 diffs)

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

@@ -433 +433 @@
 
 #ifdef RT_OS_WINDOWS
+    /* Make sure that the halt event sempahore is resetted. */
+    DWORD dwRet = WaitForSingleObject(pThis->hHaltEventSem, 0);
+
     HANDLE haWait[2];
     haWait[0] = pThis->hEventSend;
@@ -464 +467 @@
             if (!WriteFile(pThis->hDeviceFile, &pThis->aSendQueue[pThis->iSendQueueTail], cbProcessed, &cbBytesWritten, &pThis->overlappedSend))
             {
-                DWORD dwRet = GetLastError();
+                dwRet = GetLastError();
                 if (dwRet == ERROR_IO_PENDING)
                 {
@@ -472 +475 @@
                     dwRet = WaitForMultipleObjects(2, haWait, FALSE, INFINITE);
                     if (dwRet != WAIT_OBJECT_0)
+                    {
+                        AssertMsg(pThread->enmState != PDMTHREADSTATE_RUNNING, ("The halt event sempahore is set but the thread is still in running state\n"));
                         break;
+                    }
                 }
                 else
@@ -546 +552 @@
 
 #ifdef RT_OS_WINDOWS
+    /* Make sure that the halt event sempahore is resetted. */
+    DWORD dwRet = WaitForSingleObject(pThis->hHaltEventSem, 0)
+
     HANDLE ahWait[2];
-    ahWait[0] = pThis->hEventRecv;
-    ahWait[1] = pThis->hHaltEventSem;
+    haWait[0] = pThis->hEventRecv;
+    haWait[1] = pThis->hHaltEventSem;
 #endif
 
@@ -654 +663 @@
             if (!WaitCommEvent(pThis->hDeviceFile, &dwEventMask, &pThis->overlappedRecv))
             {
-                DWORD dwRet = GetLastError();
+                dwRet = GetLastError();
                 if (dwRet == ERROR_IO_PENDING)
                 {
@@ -661 +670 @@
                     {
                         /* notification to terminate */
+                        AssertMsg(pThread->enmState != PDMTHREADSTATE_RUNNING, ("The halt event sempahore is set but the thread is still in running state\n"));
                         break;
                     }