Changeset 53502 in vbox for trunk/src/VBox

Timestamp:

Dec 10, 2014 5:02:39 PM (10 years ago)

Author:

vboxsync

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

97239

Message:

NetworkServices: no need to poll here

File:

• trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp (modified) (2 diffs)

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

@@ -458 +458 @@
     syncEnter();
     m->fShutdown = true;
+    if (m->m_hThrRecv != NIL_RTTHREAD)
+    {
+        int rc = m->m_EventQ->interruptEventQueueProcessing();
+        if (RT_SUCCESS(rc))
+        {
+            rc = RTThreadWait(m->m_hThrRecv, 60000, NULL);
+            if (RT_FAILURE(rc))
+                LogWarningFunc(("RTThreadWait(%RTthrd) -> %Rrc\n", m->m_hThrRecv, rc));
+        }
+        else
+        {
+            AssertMsgFailed(("interruptEventQueueProcessing() failed\n"));
+            RTThreadWait(m->m_hThrRecv , 0, NULL);
+        }
+    }
     syncLeave();
 }
@@ -735 +750 @@
                             0, /* flags, @todo: waitable ?*/
                             "RECV");
-    AssertRCReturn(rc,rc);
+    AssertRCReturn(rc, rc);
 
     m->m_EventQ = com::NativeEventQueue::getMainEventQueue();
     AssertPtrReturn(m->m_EventQ, VERR_INTERNAL_ERROR);
 
-    while(true)
-    {
-        m->m_EventQ->processEventQueue(0);
-
-        if (m->fShutdown)
+    while (!m->fShutdown)
+    {
+        rc = m->m_EventQ->processEventQueue(RT_INDEFINITE_WAIT);
+        if (rc == VERR_INTERRUPTED)
+        {
+            LogFlow(("Event queue processing ended with rc=%Rrc\n", rc));
             break;
-
-        m->m_EventQ->processEventQueue(500);
+        }
     }