Changeset 25710 in vbox for trunk/src/VBox/Runtime/common/misc

Timestamp:

Jan 11, 2010 10:46:24 AM (15 years ago)

Author:

vboxsync

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

56447

Message:

iprt: SemRW lock order bugfixes.

File:

• trunk/src/VBox/Runtime/common/misc/lockvalidator.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/misc/lockvalidator.cpp

@@ -3046 +3046 @@
         return VINF_SUCCESS;
     AssertReturn(pRecU->Excl.hThread != NIL_RTTHREAD, VERR_SEM_LV_INVALID_PARAMETER);
+    Assert(pRecU->Excl.hThread == RTThreadSelf());
     AssertReturn(pRecU->Excl.cRecursion > 1, VERR_SEM_LV_INVALID_PARAMETER);
 
+    /*
+     * Check the release order.
+     */
+    if (   pRecU->Excl.hClass != NIL_RTLOCKVALCLASS
+        && pRecU->Excl.hClass->fStrictReleaseOrder
+        && pRecU->Excl.hClass->cMsMinOrder != RT_INDEFINITE_WAIT
+       )
+    {
+        int rc = rtLockValidatorStackCheckReleaseOrder(pRecU->Excl.hThread, pRecU);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
+
+    /*
+     * Perform the unwind.
+     */
     pRecU->Excl.cRecursion--;
     rtLockValidatorStackPopRecursion(pRecU->Excl.hThread, pRecU);
@@ -3064 +3081 @@
     if (!pRecU->Excl.fEnabled)
         return VINF_SUCCESS;
+    Assert(pRecU->Excl.hThread == RTThreadSelf());
     AssertReturn(pRecU->Excl.hThread != NIL_RTTHREAD, VERR_SEM_LV_INVALID_PARAMETER);
     AssertReturn(pRecU->Excl.cRecursion > 0, VERR_SEM_LV_INVALID_PARAMETER);
@@ -3094 +3112 @@
     if (!pRecU->Excl.fEnabled)
         return VINF_SUCCESS;
+    Assert(pRecU->Excl.hThread == RTThreadSelf());
     AssertReturn(pRecU->Excl.hThread != NIL_RTTHREAD, VERR_SEM_LV_INVALID_PARAMETER);
     AssertReturn(pRecU->Excl.cRecursion > 1, VERR_SEM_LV_INVALID_PARAMETER);
 
+    /*
+     * Check the release order.
+     */
+    if (   pRecU->Excl.hClass != NIL_RTLOCKVALCLASS
+        && pRecU->Excl.hClass->fStrictReleaseOrder
+        && pRecU->Excl.hClass->cMsMinOrder != RT_INDEFINITE_WAIT
+       )
+    {
+        int rc = rtLockValidatorStackCheckReleaseOrder(pRecU->Excl.hThread, pRecU);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
+
+    /*
+     * Perform the unwind.
+     */
     pRecU->Excl.cRecursion--;
     rtLockValidatorStackPopRecursion(pRecU->Excl.hThread, pRecU);