vbox的更動 54723 路徑 trunk/src/VBox/NetworkServices

時間撮記:

2015-3-11 下午06:26:48 (10 年 以前)

作者:

vboxsync

訊息:

NetworkServices: before shutting down the client, do perform VMMR0_DO_INTNET_IF_ABORT_WAIT

位置:

trunk/src/VBox/NetworkServices/NetLib

檔案:

• VBoxNetBaseService.cpp (修改) (5 筆差異)
• VBoxNetBaseService.h (修改) (1 筆差異)

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp

@@ -463 +463 @@
     if (m->m_hThrRecv != NIL_RTTHREAD)
     {
-        int rc = m->m_EventQ->interruptEventQueueProcessing();
+        int rc = abortWait();
+        AssertRC(rc);
+        rc = m->m_EventQ->interruptEventQueueProcessing();
         if (RT_SUCCESS(rc))
         {
@@ -494 +496 @@
 int VBoxNetBaseService::waitForIntNetEvent(int cMillis)
 {
-    int rc = VINF_SUCCESS;
     INTNETIFWAITREQ WaitReq;
     LogFlowFunc(("ENTER:cMillis: %d\n", cMillis));
@@ -503 +504 @@
     WaitReq.cMillies = cMillis;
 
-    rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_INTNET_IF_WAIT, 0, &WaitReq.Hdr);
+    int rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_INTNET_IF_WAIT, 0, &WaitReq.Hdr);
     LogFlowFuncLeaveRC(rc);
     return rc;
 }
+
+
+int VBoxNetBaseService::abortWait()
+{
+    INTNETIFABORTWAITREQ AbortReq;
+    LogFlowFunc(("ENTER:\n"));
+    AbortReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+    AbortReq.Hdr.cbReq = sizeof(AbortReq);
+    AbortReq.pSession = m->m_pSession;
+    AbortReq.hIf = m->m_hIf;
+    AbortReq.fNoMoreWaits = true;
+
+    int rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_INTNET_IF_ABORT_WAIT, 0, &AbortReq.Hdr);
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
 
 /* S/G API */
@@ -538 +556 @@
 void VBoxNetBaseService::flushWire()
 {
-    int rc = VINF_SUCCESS;
     INTNETIFSENDREQ SendReq;
     SendReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
@@ -544 +561 @@
     SendReq.pSession     = m->m_pSession;
     SendReq.hIf          = m->m_hIf;
-    rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_INTNET_IF_SEND, 0, &SendReq.Hdr);
+    int rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_INTNET_IF_SEND, 0, &SendReq.Hdr);
     AssertRCReturnVoid(rc);
     LogFlowFuncLeave();

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h

@@ -69 +69 @@
     int                 syncLeave();
     int                 waitForIntNetEvent(int cMillis);
+    int                 abortWait();
     int                 sendBufferOnWire(PCINTNETSEG pSg, int cSg, size_t cbBuffer);
     void                flushWire();