Changeset 25844 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jan 14, 2010 7:47:44 PM (15 years ago)

Author:

vboxsync

Message:

lockvalidator.cpp: Made it possible to configure it via the enviornment. Added a soft lock order mode.

File:

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

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

@@ -37 +37 @@
 #include <iprt/asm.h>
 #include <iprt/assert.h>
+#include <iprt/env.h>
 #include <iprt/err.h>
 #include <iprt/mem.h>
@@ -240 +241 @@
  */
 static RTSEMXROADS      g_hLockValidatorXRoads   = NIL_RTSEMXROADS;
+/** Serializing class tree insert and lookups. */
+static RTSEMRW          g_hLockValClassTreeRWLock= NIL_RTSEMRW;
+/** Class tree. */
+static PAVLLU32NODECORE g_LockValClassTree       = NULL;
+/** Critical section serializing the teaching new rules to the classes. */
+static RTCRITSECT       g_LockValClassTeachCS;
+
 /** Whether the lock validator is enabled or disabled.
  * Only applies to new locks.  */
@@ -255 +263 @@
 static bool volatile    g_fLockValidatorMayPanic = false;
 #endif
-/** Serializing class tree insert and lookups. */
-static RTSEMRW          g_hLockValClassTreeRWLock= NIL_RTSEMRW;
-/** Class tree. */
-static PAVLLU32NODECORE g_LockValClassTree       = NULL;
-/** Critical section serializing the teaching new rules to the classes. */
-static RTCRITSECT       g_LockValClassTeachCS;
+/** Whether to return an error status on wrong locking order. */
+static bool volatile    g_fLockValSoftWrongOrder = false;
 
 
@@ -278 +282 @@
     if (ASMAtomicCmpXchgU32(&s_fInitializing, true, false))
     {
+        /*
+         * The locks.
+         */
         if (!RTCritSectIsInitialized(&g_LockValClassTeachCS))
             RTCritSectInitEx(&g_LockValClassTeachCS, RTCRITSECT_FLAGS_NO_LOCK_VAL, NIL_RTLOCKVALCLASS,
@@ -298 +305 @@
         }
 
+#ifdef IN_RING3
+        /*
+         * Check the environment for our config variables.
+         */
+        if (RTEnvExist("IPRT_LOCK_VALIDATOR_ENABLED"))
+            ASMAtomicWriteBool(&g_fLockValidatorEnabled, true);
+        if (RTEnvExist("IPRT_LOCK_VALIDATOR_DISABLED"))
+            ASMAtomicWriteBool(&g_fLockValidatorEnabled, false);
+
+        if (RTEnvExist("IPRT_LOCK_VALIDATOR_MAY_PANIC"))
+            ASMAtomicWriteBool(&g_fLockValidatorMayPanic, true);
+        if (RTEnvExist("IPRT_LOCK_VALIDATOR_MAY_NOT_PANIC"))
+            ASMAtomicWriteBool(&g_fLockValidatorMayPanic, false);
+
+        if (RTEnvExist("IPRT_LOCK_VALIDATOR_NOT_QUIET"))
+            ASMAtomicWriteBool(&g_fLockValidatorQuiet, false);
+        if (RTEnvExist("IPRT_LOCK_VALIDATOR_QUIET"))
+            ASMAtomicWriteBool(&g_fLockValidatorQuiet, true);
+
+        if (RTEnvExist("IPRT_LOCK_VALIDATOR_STRICT_ORDER"))
+            ASMAtomicWriteBool(&g_fLockValSoftWrongOrder, false);
+        if (RTEnvExist("IPRT_LOCK_VALIDATOR_SOFT_ORDER"))
+            ASMAtomicWriteBool(&g_fLockValSoftWrongOrder, true);
+#endif
+
+        /*
+         * Register cleanup
+         */
         /** @todo register some cleanup callback if we care. */
 
@@ -1448 +1483 @@
     }
     else
-        rc = VERR_SEM_LV_WRONG_ORDER;
+        rc = !g_fLockValSoftWrongOrder ? VERR_SEM_LV_WRONG_ORDER : VINF_SUCCESS;
 
     if (RT_SUCCESS(rcLock))
@@ -2133 +2168 @@
     rtLockValComplainAboutLockStack(pThreadSelf, 0, 0, pRec2);
     rtLockValComplainPanic();
-    return VERR_SEM_LV_WRONG_ORDER;
+    return !g_fLockValSoftWrongOrder ? VERR_SEM_LV_WRONG_ORDER : VINF_SUCCESS;
 }
 
@@ -2442 +2477 @@
     rtLockValComplainFirst("Wrong release order!", NULL, pThreadSelf, pRec, true);
     rtLockValComplainPanic();
-    return VERR_SEM_LV_WRONG_RELEASE_ORDER;
+    return !g_fLockValSoftWrongOrder ? VERR_SEM_LV_WRONG_RELEASE_ORDER : VINF_SUCCESS;
 }