Changeset 25831 in vbox for trunk/src/VBox/Runtime/r3/posix

Timestamp:

Jan 14, 2010 3:12:53 PM (15 years ago)

Author:

vboxsync

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

56611

Message:

iprt/lockvalidation: give better names to anonymous locks

Location:

trunk/src/VBox/Runtime/r3/posix

Files:

• semevent-posix.cpp (modified) (1 diff)
• semeventmulti-posix.cpp (modified) (1 diff)
• semmutex-posix.cpp (modified) (1 diff)
• semrw-posix.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/posix/semevent-posix.cpp

@@ -139 +139 @@
                         ASMAtomicXchgU32(&pThis->cWaiters, 0);
 #ifdef RTSEMEVENT_STRICT
-                        va_list va;
-                        va_start(va, pszNameFmt);
-                        RTLockValidatorRecSharedInitV(&pThis->Signallers, hClass, RTLOCKVAL_SUB_CLASS_ANY, pThis,
-                                                      true /*fSignaller*/, !(fFlags & RTSEMEVENT_FLAGS_NO_LOCK_VAL),
-                                                      pszNameFmt, va);
-                        va_end(va);
+                        if (!pszNameFmt)
+                        {
+                            static uint32_t volatile s_iSemEventAnon = 0;
+                            RTLockValidatorRecSharedInit(&pThis->Signallers, hClass, RTLOCKVAL_SUB_CLASS_ANY, pThis,
+                                                         true /*fSignaller*/, !(fFlags & RTSEMEVENT_FLAGS_NO_LOCK_VAL),
+                                                         "RTSemEvent-%u", ASMAtomicIncU32(&s_iSemEventAnon) - 1);
+                        }
+                        else
+                        {
+                            va_list va;
+                            va_start(va, pszNameFmt);
+                            RTLockValidatorRecSharedInitV(&pThis->Signallers, hClass, RTLOCKVAL_SUB_CLASS_ANY, pThis,
+                                                          true /*fSignaller*/, !(fFlags & RTSEMEVENT_FLAGS_NO_LOCK_VAL),
+                                                          pszNameFmt, va);
+                            va_end(va);
+                        }
                         pThis->fEverHadSignallers = false;
 #endif

trunk/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp

@@ -130 +130 @@
                         ASMAtomicXchgU32(&pThis->cWaiters, 0);
 #ifdef RTSEMEVENTMULTI_STRICT
-                        va_list va;
-                        va_start(va, pszNameFmt);
-                        RTLockValidatorRecSharedInitV(&pThis->Signallers, hClass, RTLOCKVAL_SUB_CLASS_ANY, pThis,
-                                                      true /*fSignaller*/, !(fFlags & RTSEMEVENTMULTI_FLAGS_NO_LOCK_VAL),
-                                                      pszNameFmt, va);
-                        va_end(va);
+                        if (!pszNameFmt)
+                        {
+                            static uint32_t volatile s_iSemEventMultiAnon = 0;
+                            RTLockValidatorRecSharedInit(&pThis->Signallers, hClass, RTLOCKVAL_SUB_CLASS_ANY, pThis,
+                                                         true /*fSignaller*/, !(fFlags & RTSEMEVENTMULTI_FLAGS_NO_LOCK_VAL),
+                                                         "RTSemEventMulti-%u", ASMAtomicIncU32(&s_iSemEventMultiAnon) - 1);
+                        }
+                        else
+                        {
+                            va_list va;
+                            va_start(va, pszNameFmt);
+                            RTLockValidatorRecSharedInitV(&pThis->Signallers, hClass, RTLOCKVAL_SUB_CLASS_ANY, pThis,
+                                                          true /*fSignaller*/, !(fFlags & RTSEMEVENTMULTI_FLAGS_NO_LOCK_VAL),
+                                                          pszNameFmt, va);
+                            va_end(va);
+                        }
                         pThis->fEverHadSignallers = false;
 #endif

trunk/src/VBox/Runtime/r3/posix/semmutex-posix.cpp

@@ -106 +106 @@
                 pThis->u32Magic = RTSEMMUTEX_MAGIC;
 #ifdef RTSEMMUTEX_STRICT
-                va_list va;
-                va_start(va, pszNameFmt);
-                RTLockValidatorRecExclInitV(&pThis->ValidatorRec, hClass, uSubClass, pThis,
-                                            !(fFlags & RTSEMMUTEX_FLAGS_NO_LOCK_VAL), pszNameFmt, va);
-                va_end(va);
+                if (!pszNameFmt)
+                {
+                    static uint32_t volatile s_iMutexAnon = 0;
+                    RTLockValidatorRecExclInit(&pThis->ValidatorRec, hClass, uSubClass, pThis,
+                                               !(fFlags & RTSEMMUTEX_FLAGS_NO_LOCK_VAL),
+                                               "RTSemMutex-%u", ASMAtomicIncU32(&s_iMutexAnon) - 1);
+                }
+                else
+                {
+                    va_list va;
+                    va_start(va, pszNameFmt);
+                    RTLockValidatorRecExclInitV(&pThis->ValidatorRec, hClass, uSubClass, pThis,
+                                                !(fFlags & RTSEMMUTEX_FLAGS_NO_LOCK_VAL), pszNameFmt, va);
+                    va_end(va);
+                }
 #endif
 

trunk/src/VBox/Runtime/r3/posix/semrw-posix.cpp

@@ -130 +130 @@
 #ifdef RTSEMRW_STRICT
                 bool const fLVEnabled = !(fFlags & RTSEMRW_FLAGS_NO_LOCK_VAL);
-                va_list va;
-                va_start(va, pszNameFmt);
-                RTLockValidatorRecExclInitV(&pThis->ValidatorWrite, hClass, uSubClass, pThis, fLVEnabled, pszNameFmt, va);
-                va_end(va);
-                va_start(va, pszNameFmt);
-                RTLockValidatorRecSharedInitV(&pThis->ValidatorRead, hClass, uSubClass, pThis, false /*fSignaller*/,
-                                              fLVEnabled, pszNameFmt, va);
-                va_end(va);
+                if (!pszNameFmt)
+                {
+                    static uint32_t volatile s_iSemRWAnon = 0;
+                    uint32_t i = ASMAtomicIncU32(&s_iSemRWAnon) - 1;
+                    RTLockValidatorRecExclInit(&pThis->ValidatorWrite, hClass, uSubClass, pThis,
+                                               fLVEnabled, "RTSemRW-%u", i);
+                    RTLockValidatorRecSharedInit(&pThis->ValidatorRead, hClass, uSubClass, pThis,
+                                                 false /*fSignaller*/, fLVEnabled, "RTSemRW-%u", i);
+                }
+                else
+                {
+                    va_list va;
+                    va_start(va, pszNameFmt);
+                    RTLockValidatorRecExclInitV(&pThis->ValidatorWrite, hClass, uSubClass, pThis,
+                                                fLVEnabled, pszNameFmt, va);
+                    va_end(va);
+                    va_start(va, pszNameFmt);
+                    RTLockValidatorRecSharedInitV(&pThis->ValidatorRead, hClass, uSubClass, pThis,
+                                                  false /*fSignaller*/, fLVEnabled, pszNameFmt, va);
+                    va_end(va);
+                }
                 RTLockValidatorRecMakeSiblings(&pThis->ValidatorWrite.Core, &pThis->ValidatorRead.Core);
 #endif