儲存庫 vbox 的更動 1775

時間撮記:

2007-3-28 下午02:35:33 (18 年 以前)

作者:

vboxsync

訊息:

shutdown change

位置:

trunk/src/VBox/Devices/Serial

檔案:

• DrvChar.cpp (修改) (2 筆差異)
• DrvNamedPipe.cpp (修改) (1 筆差異)

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

@@ -349 +349 @@
 
     pData->fShutdown = true;
-    RTThreadWait(pData->ReceiveThread, 1000, NULL);
-    if (pData->ReceiveThread != NIL_RTTHREAD)
-        LogRel(("Char%d: receive thread did not terminate\n", pDrvIns->iInstance));
+    if (pData->ReceiveThread)
+    {
+        RTThreadWait(pData->ReceiveThread, 1000, NULL);
+        if (pData->ReceiveThread != NIL_RTTHREAD)
+            LogRel(("Char%d: receive thread did not terminate\n", pDrvIns->iInstance));
+    }
 
     /* Empty the send queue */
@@ -360 +363 @@
     pData->SendSem = NIL_RTSEMEVENT;
 
-    RTThreadWait(pData->SendThread, 1000, NULL);
-    if (pData->SendThread != NIL_RTTHREAD)
-        LogRel(("Char%d: send thread did not terminate\n", pDrvIns->iInstance));
-}
-
+    if (pData->SendThread)
+    {
+        RTThreadWait(pData->SendThread, 1000, NULL);
+        if (pData->SendThread != NIL_RTTHREAD)
+            LogRel(("Char%d: send thread did not terminate\n", pDrvIns->iInstance));
+    }
+}
 
 /**

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

@@ -146 +146 @@
         if (VBOX_FAILURE(rc))
         {
-            Log(("drvNamedPipeRead: RTFileRead returned %Vrc\n", rc));
+            Log(("drvNamedPipeRead: RTFileRead returned %Vrc fShutdown=%d\n", rc, pData->fShutdown));
             if (    !pData->fShutdown
                 &&  (   rc == VERR_EOF