Changeset 32117 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Aug 31, 2010 9:45:01 AM (15 years ago)

Author:

vboxsync

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

65392

Message:

Backed out r65185 as the fix shall be done in socket rtSocketPollDone/rtSocketPollStart.

File:

• trunk/src/VBox/Runtime/r3/win/poll-win.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/r3/win/poll-win.cpp

@@ -65 +65 @@
     /** The events we're waiting for here. */
     uint32_t        fEvents;
-    /** Saved events. */
-    uint32_t        fEventsSaved;
     /** Set if this is the final entry for this handle.
      * If the handle is entered more than once, this will be clear for all but
@@ -96 +94 @@
 } RTPOLLSETINTERNAL;
 
-/**
- * Starts polling based on the handle type.
- */
-static uint32_t rtPollHndStart(RTPOLLSETINTERNAL *pThis, PRTPOLLSETHNDENT pHnd, bool fNoWait)
-{
-    uint32_t fEvents = 0;
-
-    switch (pHnd->enmType)
-    {
-        case RTHANDLETYPE_PIPE:
-            fEvents = rtPipePollStart(pHnd->u.hPipe, pThis, pHnd->fEvents,
-                                      pHnd->fFinalEntry, fNoWait);
-        break;
-
-        case RTHANDLETYPE_SOCKET:
-            fEvents = rtSocketPollStart(pHnd->u.hSocket, pThis, pHnd->fEvents,
-                                        pHnd->fFinalEntry, fNoWait);
-            break;
-
-        default:
-            AssertFailed();
-            fEvents = UINT32_MAX;
-            break;
-    }
-
-    return fEvents;
-}
-
-/**
- * Cleans up polling based on the handle type.
- */
-static uint32_t rtPollHndDone(PRTPOLLSETHNDENT pHnd)
-{
-    uint32_t fEvents = 0;
-
-    switch (pHnd->enmType)
-    {
-        case RTHANDLETYPE_PIPE:
-            fEvents = rtPipePollDone(pHnd->u.hPipe, pHnd->fEvents,
-                                     pHnd->fFinalEntry);
-            break;
-
-        case RTHANDLETYPE_SOCKET:
-            fEvents = rtSocketPollDone(pHnd->u.hSocket, pHnd->fEvents,
-                                       pHnd->fFinalEntry);
-            break;
-
-        default:
-            AssertFailed();
-            fEvents = UINT32_MAX;
-            break;
-    }
-
-    return fEvents;
-}
 
 /**
@@ -182 +125 @@
     for (i = 0; i < cHandles; i++)
     {
-        if (pThis->aHandles[i].fEventsSaved)
-        {
-            fEvents = pThis->aHandles[i].fEventsSaved;
-            pThis->aHandles[i].fEventsSaved = 0;
-            break;
-        }
-
-        fEvents = rtPollHndStart(pThis, &pThis->aHandles[i], fNoWait);
+        switch (pThis->aHandles[i].enmType)
+        {
+            case RTHANDLETYPE_PIPE:
+                fEvents = rtPipePollStart(pThis->aHandles[i].u.hPipe, pThis, pThis->aHandles[i].fEvents,
+                                          pThis->aHandles[i].fFinalEntry, fNoWait);
+                break;
+
+            case RTHANDLETYPE_SOCKET:
+                fEvents = rtSocketPollStart(pThis->aHandles[i].u.hSocket, pThis, pThis->aHandles[i].fEvents,
+                                            pThis->aHandles[i].fFinalEntry, fNoWait);
+                break;
+
+            default:
+                AssertFailed();
+                fEvents = UINT32_MAX;
+                break;
+        }
         if (fEvents)
             break;
@@ -211 +163 @@
             while (i-- > 0)
             {
-                pThis->aHandles[i].fEventsSaved = rtPollHndDone(&pThis->aHandles[i]);
+                switch (pThis->aHandles[i].enmType)
+                {
+                    case RTHANDLETYPE_PIPE:
+                        rtPipePollDone(pThis->aHandles[i].u.hPipe, pThis->aHandles[i].fEvents,
+                                       pThis->aHandles[i].fFinalEntry);
+                        break;
+
+                    case RTHANDLETYPE_SOCKET:
+                        rtSocketPollDone(pThis->aHandles[i].u.hSocket, pThis->aHandles[i].fEvents,
+                                         pThis->aHandles[i].fFinalEntry);
+                        break;
+
+                    default:
+                        AssertFailed();
+                        break;
+                }
             }
 
@@ -242 +209 @@
      * Get event (if pending) and do wait cleanup.
      */
-    for (unsigned i = 0; i < cHandles; i++)
-    {
-        if (!fEvents)
-        {
-            fEvents = rtPollHndDone(&pThis->aHandles[i]);
-
-            if (fEvents)
-            {
-                Assert(fEvents != UINT32_MAX);
-                if (pfEvents)
-                 *pfEvents = fEvents;
-                if (pid)
-                 *pid = pThis->aHandles[i].id;
-                rc = VINF_SUCCESS;
-            }
-        }
-        else
-            pThis->aHandles[i].fEventsSaved = rtPollHndDone(&pThis->aHandles[i]);
+    /** @todo r=aeichner: The loop below overwrites events if
+     *  more than one source has events pending.
+     */
+    i = cHandles;
+    while (i-- > 0)
+    {
+        fEvents = 0;
+        switch (pThis->aHandles[i].enmType)
+        {
+            case RTHANDLETYPE_PIPE:
+                fEvents = rtPipePollDone(pThis->aHandles[i].u.hPipe, pThis->aHandles[i].fEvents,
+                                         pThis->aHandles[i].fFinalEntry);
+                break;
+
+            case RTHANDLETYPE_SOCKET:
+                fEvents = rtSocketPollDone(pThis->aHandles[i].u.hSocket, pThis->aHandles[i].fEvents,
+                                           pThis->aHandles[i].fFinalEntry);
+                break;
+
+            default:
+                AssertFailed();
+                break;
+        }
+        if (fEvents)
+        {
+            Assert(fEvents != UINT32_MAX);
+            if (pfEvents)
+                *pfEvents = fEvents;
+            if (pid)
+                *pid = pThis->aHandles[i].id;
+            rc = VINF_SUCCESS;
+        }
     }