Changeset 49999 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Dec 24, 2013 7:23:21 PM (11 years ago)

Author:

vboxsync

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

91433

Message:

pdmR3R0CritSectEnterContended: Ok, that didn't work, so next attempt.

File:

• trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp

@@ -112 +112 @@
  * Deals with the contended case in ring-3 and ring-0.
  *
- * @returns VINF_SUCCESS or VERR_SEM_DESTROYED.
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_SEM_DESTROYED if destroyed.
+ * @retval  VERR_INTERRUPTED in ring-0 if we should return rcBusy or jump to
+ *          ring-3.
+ *
  * @param   pCritSect           The critsect.
  * @param   hNativeSelf         The native thread handle.
@@ -144 +148 @@
 #  endif
 # endif
-    for (unsigned i = 0;; i++)
+    for (;;)
     {
         /*
@@ -154 +158 @@
          * In ring-0 we have to deal with the possibility that the thread has
          * been signalled and the interruptible wait function returning
-         * immediately.  We handle this by prefering the interruptible wait
-         * and alternating with short period of non-interruptible waiting.
+         * immediately.  In that case we do normal R0/RC rcBusy handling.
          */
 # ifdef IN_RING3
@@ -170 +173 @@
         RTThreadUnblocked(hThreadSelf, RTTHREADSTATE_CRITSECT);
 # else  /* IN_RING0 */
-        int rc;
-        if ((i & 1) == 0)
-            rc = SUPSemEventWaitNoResume(pSession, hEvent, RT_INDEFINITE_WAIT);
-        else
-            rc = SUPSemEventWait(pSession, hEvent, 1000 /*ms*/);
+        int rc = SUPSemEventWaitNoResume(pSession, hEvent, RT_INDEFINITE_WAIT);
 # endif /* IN_RING0 */
 
@@ -184 +183 @@
         if (rc == VINF_SUCCESS)
             return pdmCritSectEnterFirst(pCritSect, hNativeSelf, pSrcPos);
-# ifdef IN_RING3
         AssertMsg(rc == VERR_INTERRUPTED, ("rc=%Rrc\n", rc));
-# else
-        AssertMsg(rc == (!(i & 1) ? VERR_INTERRUPTED : VERR_TIMEOUT), ("rc=%Rrc i=%u\n", rc, i));
+# ifdef IN_RING0
+        return VERR_INTERRUPTED;
 # endif
     }
@@ -308 +306 @@
     if (   RTThreadPreemptIsEnabled(NIL_RTTHREAD)
         && ASMIntAreEnabled())
-        return pdmR3R0CritSectEnterContended(pCritSect, hNativeSelf, pSrcPos);
+    {
+        int rc = pdmR3R0CritSectEnterContended(pCritSect, hNativeSelf, pSrcPos);
+        if (rc != VERR_INTERRUPTED)
+            return rc;
+    }
 #  endif
 #endif /* IN_RING0 */