Changeset 25834 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Jan 14, 2010 4:21:05 PM (15 years ago)

Author:

vboxsync

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

56614

Message:

Main: finish integration of Main lock validation with IPRT; only enabled with VBOX_WITH_STRICT_LOCKS=1 (do NOT enable unless you want Main to stop working now)

File:

• trunk/src/VBox/Main/glue/AutoLock.cpp (modified) (17 diffs)

trunk/src/VBox/Main/glue/AutoLock.cpp

@@ -41 +41 @@
 #include <vector>
 #include <list>
+#include <map>
 
 namespace util
@@ -51 +52 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-class RuntimeLockClass
-{
-};
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
+typedef std::map<VBoxLockingClass, RTLOCKVALCLASS> LockValidationClassesMap;
+LockValidationClassesMap g_mapLockValidationClasses;
+#endif
 
 /**
@@ -61 +63 @@
 void InitAutoLockSystem()
 {
-    RTPrintf("InitAutoLockSystem\n");
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
+    struct
+    {
+        VBoxLockingClass    cls;
+        const char          *pcszDescription;
+    } aClasses[] =
+    {
+        { LOCKCLASS_VIRTUALBOXOBJECT, "1-VIRTUALBOXOBJECT" },
+        { LOCKCLASS_VIRTUALBOXLIST,   "2-VIRTUALBOXLIST" },
+        { LOCKCLASS_USBPROXYSERVICE,  "3-USBPROXYSERVICE" },
+        { LOCKCLASS_HOSTOBJECT,       "4-HOSTOBJECT" },
+        { LOCKCLASS_HOSTLIST,         "5-HOSTLIST" },
+        { LOCKCLASS_OTHEROBJECT,      "6-OTHEROBJECT" },
+        { LOCKCLASS_OTHERLIST,        "7-OTHERLIST" },
+        { LOCKCLASS_OBJECTSTATE,      "8-OBJECTSTATE" }
+    };
+
+    RTLOCKVALCLASS hClass;
+    int vrc;
+    for (unsigned i = 0; i < RT_ELEMENTS(aClasses); ++i)
+    {
+        vrc = RTLockValidatorClassCreate(&hClass,
+                                         true, /*fAutodidact*/
+                                         RT_SRC_POS,
+                                         aClasses[i].pcszDescription);
+        AssertRC(vrc);
+
+        // teach the new class that the classes created previously can be held
+        // while the new class is being acquired
+        for (LockValidationClassesMap::iterator it = g_mapLockValidationClasses.begin();
+             it != g_mapLockValidationClasses.end();
+             ++it)
+        {
+            RTLOCKVALCLASS &canBeHeld = it->second;
+            vrc = RTLockValidatorClassAddPriorClass(hClass,
+                                                    canBeHeld);
+            AssertRC(vrc);
+        }
+
+        // and store the new class
+        g_mapLockValidationClasses[aClasses[i].cls] = hClass;
+    }
+
+/*    WriteLockHandle critsect1(LOCKCLASS_VIRTUALBOXOBJECT);
+    WriteLockHandle critsect2(LOCKCLASS_VIRTUALBOXLIST);
+
+    AutoWriteLock lock1(critsect1 COMMA_LOCKVAL_SRC_POS);
+    AutoWriteLock lock2(critsect2 COMMA_LOCKVAL_SRC_POS);*/
+#endif
 }
 
@@ -76 +126 @@
 
     RTSEMRW                     sem;
-    MainLockValidationClasses   lockClass;
-
-#ifdef RT_LOCK_STRICT
+    VBoxLockingClass   lockClass;
+
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
     com::Utf8Str                strDescription;
 #endif
 };
 
-RWLockHandle::RWLockHandle(MainLockValidationClasses lockClass)
+RWLockHandle::RWLockHandle(VBoxLockingClass lockClass)
 {
     m = new Data();
@@ -89 +139 @@
     m->lockClass = lockClass;
 
-    int vrc = RTSemRWCreateEx(&m->sem, 0 /*fFlags*/, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_NONE, NULL);
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
+    m->strDescription = com::Utf8StrFmt("r/w %RCv", this);
+    int vrc = RTSemRWCreateEx(&m->sem, 0 /*fFlags*/, g_mapLockValidationClasses[lockClass], RTLOCKVAL_SUB_CLASS_ANY, NULL);
+#else
+    int vrc = RTSemRWCreateEx(&m->sem, 0 /*fFlags*/, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_ANY, NULL);
+#endif
     AssertRC(vrc);
-
-#ifdef RT_LOCK_STRICT
-    m->strDescription = com::Utf8StrFmt("r/w %RCv", this);
-#endif
 }
 
@@ -110 +161 @@
 /*virtual*/ void RWLockHandle::lockWrite(LOCKVAL_SRC_POS_DECL)
 {
-#if defined(RT_LOCK_STRICT)
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
     int vrc = RTSemRWRequestWriteDebug(m->sem, RT_INDEFINITE_WAIT, (uintptr_t)ASMReturnAddress(), RT_SRC_POS_ARGS);
 #else
@@ -127 +178 @@
 /*virtual*/ void RWLockHandle::lockRead(LOCKVAL_SRC_POS_DECL)
 {
-#if defined(RT_LOCK_STRICT)
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
     int vrc = RTSemRWRequestReadDebug(m->sem, RT_INDEFINITE_WAIT, (uintptr_t)ASMReturnAddress(), RT_SRC_POS_ARGS);
 #else
@@ -147 +198 @@
 }
 
-#ifdef RT_LOCK_STRICT
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
 /*virtual*/ const char* RWLockHandle::describe() const
 {
@@ -166 +217 @@
 
     mutable RTCRITSECT          sem;
-    MainLockValidationClasses   lockClass;
-
-#ifdef RT_LOCK_STRICT
+    VBoxLockingClass   lockClass;
+
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
     com::Utf8Str                strDescription;
 #endif
 };
 
-WriteLockHandle::WriteLockHandle(MainLockValidationClasses lockClass)
+WriteLockHandle::WriteLockHandle(VBoxLockingClass lockClass)
 {
     m = new Data;
@@ -179 +230 @@
     m->lockClass = lockClass;
 
-    int vrc = RTCritSectInitEx(&m->sem, 0/*fFlags*/, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_NONE, NULL);
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
+    m->strDescription = com::Utf8StrFmt("crit %RCv", this);
+    int vrc = RTCritSectInitEx(&m->sem, 0/*fFlags*/, g_mapLockValidationClasses[lockClass], RTLOCKVAL_SUB_CLASS_ANY, NULL);
+#else
+    int vrc = RTCritSectInitEx(&m->sem, 0/*fFlags*/, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_ANY, NULL);
+#endif
     AssertRC(vrc);
-
-#ifdef RT_LOCK_STRICT
-    m->strDescription = com::Utf8StrFmt("crit %RCv", this);
-#endif
 }
 
@@ -200 +252 @@
 /*virtual*/ void WriteLockHandle::lockWrite(LOCKVAL_SRC_POS_DECL)
 {
-#if defined(RT_LOCK_STRICT)
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
     RTCritSectEnterDebug(&m->sem, (uintptr_t)ASMReturnAddress(), RT_SRC_POS_ARGS);
 #else
@@ -227 +279 @@
 }
 
-#ifdef RT_LOCK_STRICT
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
 /*virtual*/ const char* WriteLockHandle::describe() const
 {
@@ -246 +298 @@
 {
     Data(size_t cHandles
-#ifdef RT_LOCK_STRICT
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
          , const char *pcszFile_,
          unsigned uLine_,
@@ -255 +307 @@
           aHandles(cHandles),       // size of array
           acUnlockedInLeave(cHandles)
-#ifdef RT_LOCK_STRICT
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
           , pcszFile(pcszFile_),
           uLine(uLine_),
@@ -275 +327 @@
     CountsVector    acUnlockedInLeave;  // for each lock handle, how many times the handle was unlocked in leave(); otherwise 0
 
-#ifdef RT_LOCK_STRICT
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
     // information about where the lock occured (passed down from the AutoLock classes)
     const char      *pcszFile;
@@ -443 +495 @@
 /*virtual*/ void AutoReadLock::callLockImpl(LockHandle &l)
 {
-#ifdef RT_LOCK_STRICT
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
     l.lockRead(m->pcszFile, m->uLine, m->pcszFunction);
 #else
@@ -475 +527 @@
 /*virtual*/ void AutoWriteLockBase::callLockImpl(LockHandle &l)
 {
-#ifdef RT_LOCK_STRICT
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
     l.lockWrite(m->pcszFile, m->uLine, m->pcszFunction);
 #else