Changeset 106077 in vbox for trunk/src/VBox

Timestamp:

Sep 17, 2024 7:36:17 PM (3 months ago)

Author:

vboxsync

Message:

Main: Name locks.

Location:

trunk/src/VBox/Main

Files:

• glue/AutoLock.cpp (modified) (1 diff)
• src-all/VirtualBoxBase.cpp (modified) (1 diff)
• src-all/VirtualBoxTranslator.cpp (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-server/ClientWatcher.cpp (modified) (2 diffs)
• src-server/MediumImpl.cpp (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (2 diffs)

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

@@ -168 +168 @@
 };
 
-RWLockHandle::RWLockHandle(VBoxLockingClass lockClass)
-{
+RWLockHandle::RWLockHandle(VBoxLockingClass lockClass, const char *pszName /*= NULL*/)
+{
+    Assert(!pszName || (!strchr(pszName, '%') && *pszName));
     m = new Data();
 
     m->lockClass = lockClass;
 #ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
-    m->strDescription.printf("r/w %RCv", this);
+    if (pszName)
+        m->strDescription.printf("r/w %RCv %s", this, pszName);
+    else
+        m->strDescription.printf("r/w %RCv", this);
 #endif
 
 #ifdef GLUE_USE_CRITSECTRW
 # ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
-    int vrc = RTCritSectRwInitEx(&m->CritSect, 0 /*fFlags*/, g_mapLockValidationClasses[lockClass], RTLOCKVAL_SUB_CLASS_ANY, NULL);
+    int vrc = RTCritSectRwInitEx(&m->CritSect, 0 /*fFlags*/, g_mapLockValidationClasses[lockClass], RTLOCKVAL_SUB_CLASS_ANY, pszName);
 # else
-    int vrc = RTCritSectRwInitEx(&m->CritSect, 0 /*fFlags*/, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_ANY, NULL);
+    int vrc = RTCritSectRwInitEx(&m->CritSect, 0 /*fFlags*/, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_ANY, pszName);
 # endif
 #else
 # ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
-    int vrc = RTSemRWCreateEx(&m->sem, 0 /*fFlags*/, g_mapLockValidationClasses[lockClass], RTLOCKVAL_SUB_CLASS_ANY, NULL);
+    int vrc = RTSemRWCreateEx(&m->sem, 0 /*fFlags*/, g_mapLockValidationClasses[lockClass], RTLOCKVAL_SUB_CLASS_ANY, pszName);
 # else
-    int vrc = RTSemRWCreateEx(&m->sem, 0 /*fFlags*/, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_ANY, NULL);
+    int vrc = RTSemRWCreateEx(&m->sem, 0 /*fFlags*/, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_ANY, pszName);
 # endif
 #endif

trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp

@@ -195 +195 @@
     // getLockingClass() is overridden by many subclasses to return
     // one of the locking classes listed at the top of AutoLock.h
-    RWLockHandle *objLock = new RWLockHandle(getLockingClass());
+    // getComponentName() returns the class name by default.
+    RWLockHandle *objLock = new RWLockHandle(getLockingClass(), getComponentName());
     if (!ASMAtomicCmpXchgPtr(&mObjectLock, objLock, NULL))
     {

trunk/src/VBox/Main/src-all/VirtualBoxTranslator.cpp

@@ -147 +147 @@
 
 VirtualBoxTranslator::VirtualBoxTranslator()
-    : util::RWLockHandle(util::LOCKCLASS_TRANSLATOR)
+    : util::RWLockHandle(util::LOCKCLASS_TRANSLATOR, "VirtualBoxTranslator")
     , m_cInstanceRefs(0)
     , m_pDefaultComponent(NULL)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -431 +431 @@
 #endif
     , mBusMgr(NULL)
-    , mLedLock(LOCKCLASS_LISTOFOTHEROBJECTS /* must be higher than LOCKCLASS_OTHEROBJECT */)
+    , mLedLock(LOCKCLASS_LISTOFOTHEROBJECTS /* must be higher than LOCKCLASS_OTHEROBJECT */, "LedLock")
     , muLedGen(0)
     , muLedTypeGen(0)

trunk/src/VBox/Main/src-server/ClientWatcher.cpp

@@ -55 +55 @@
 
 VirtualBox::ClientWatcher::ClientWatcher() :
-    mLock(LOCKCLASS_OBJECTSTATE)
+    mLock(LOCKCLASS_OBJECTSTATE, "ClientWatcher")
 {
     AssertReleaseFailed();
@@ -92 +92 @@
     mThread(NIL_RTTHREAD),
     mUpdateReq(CWUPDATEREQARG),
-    mLock(LOCKCLASS_OBJECTSTATE)
+    mLock(LOCKCLASS_OBJECTSTATE, "ClientWatcher")
 {
 #if defined(RT_OS_WINDOWS)

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -178 +178 @@
           readers(0),
           preLockState(MediumState_NotCreated),
-          queryInfoSem(LOCKCLASS_MEDIUMQUERY),
+          queryInfoSem(LOCKCLASS_MEDIUMQUERY, "queryInfoSem"),
           queryInfoRunning(false),
           type(MediumType_Normal),

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -293 +293 @@
         , uuidMediaRegistry("48024e5c-fdd9-470f-93af-ec29f7ea518c")
         , uRegistryNeedsSaving(0)
-        , lockMachines(LOCKCLASS_LISTOFMACHINES)
+        , lockMachines(LOCKCLASS_LISTOFMACHINES, "Machines")
         , allMachines(lockMachines)
-        , lockGuestOSTypes(LOCKCLASS_LISTOFOTHEROBJECTS)
+        , lockGuestOSTypes(LOCKCLASS_LISTOFOTHEROBJECTS, "GuestOSTypes")
         , allGuestOSTypes(lockGuestOSTypes)
-        , lockMedia(LOCKCLASS_LISTOFMEDIA)
+        , lockMedia(LOCKCLASS_LISTOFMEDIA, "Media")
         , allHardDisks(lockMedia)
         , allDVDImages(lockMedia)
         , allFloppyImages(lockMedia)
-        , lockSharedFolders(LOCKCLASS_LISTOFOTHEROBJECTS)
+        , lockSharedFolders(LOCKCLASS_LISTOFOTHEROBJECTS, "SharedFolders")
         , allSharedFolders(lockSharedFolders)
-        , lockDHCPServers(LOCKCLASS_LISTOFOTHEROBJECTS)
+        , lockDHCPServers(LOCKCLASS_LISTOFOTHEROBJECTS, "DHCPServers")
         , allDHCPServers(lockDHCPServers)
-        , lockNATNetworks(LOCKCLASS_LISTOFOTHEROBJECTS)
+        , lockNATNetworks(LOCKCLASS_LISTOFOTHEROBJECTS, "NATNetworks")
         , allNATNetworks(lockNATNetworks)
 #ifdef VBOX_WITH_VMNET
-        , lockHostOnlyNetworks(LOCKCLASS_LISTOFOTHEROBJECTS)
+        , lockHostOnlyNetworks(LOCKCLASS_LISTOFOTHEROBJECTS, "HostOnlyNetworks")
         , allHostOnlyNetworks(lockHostOnlyNetworks)
 #endif /* VBOX_WITH_VMNET */
 #ifdef VBOX_WITH_CLOUD_NET
-        , lockCloudNetworks(LOCKCLASS_LISTOFOTHEROBJECTS)
+        , lockCloudNetworks(LOCKCLASS_LISTOFOTHEROBJECTS, "CloudNetworks")
         , allCloudNetworks(lockCloudNetworks)
 #endif /* VBOX_WITH_CLOUD_NET */
-        , mtxProgressOperations(LOCKCLASS_PROGRESSLIST)
+        , mtxProgressOperations(LOCKCLASS_PROGRESSLIST, "ProgressOperations")
         , pClientWatcher(NULL)
         , threadAsyncEvent(NIL_RTTHREAD)
@@ -558 +558 @@
         sAPIVersion = VBOX_API_VERSION_STRING;
     if (!spMtxNatNetworkNameToRefCountLock)
-        spMtxNatNetworkNameToRefCountLock = new RWLockHandle(LOCKCLASS_VIRTUALBOXOBJECT);
+        spMtxNatNetworkNameToRefCountLock = new RWLockHandle(LOCKCLASS_VIRTUALBOXOBJECT, "spMtxNatNetworkNameToRefCountLock");
 
     LogFlowThisFunc(("Version: %s, Package: %s, API Version: %s\n", sVersion.c_str(), sPackageType.c_str(), sAPIVersion.c_str()));