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

Timestamp:

Jan 11, 2010 10:02:03 AM (15 years ago)

Author:

vboxsync

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

56444

Message:

iprt: Added RTSemRWCreateEx and RTSemRWSetSubClass. Updated tstRTLockValidator with a test of the SemRW lock order validation.

File:

• trunk/src/VBox/Runtime/r3/posix/semrw-posix.cpp (modified) (7 diffs)

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

@@ -93 +93 @@
 
 
-/* No debug wrapping here. */
-#undef RTSemRWRequestRead
-#undef RTSemRWRequestReadNoResume
-#undef RTSemRWRequestWrite
-#undef RTSemRWRequestWriteNoResume
-
-
-RTDECL(int) RTSemRWCreate(PRTSEMRW pRWSem)
-{
+
+#undef RTSemRWCreate
+RTDECL(int) RTSemRWCreate(PRTSEMRW phRWSem)
+{
+    return RTSemRWCreateEx(phRWSem, 0 /*fFlags*/, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_NONE, "RTSemRW");
+}
+
+
+RTDECL(int) RTSemRWCreateEx(PRTSEMRW phRWSem, uint32_t fFlags,
+                            RTLOCKVALCLASS hClass, uint32_t uSubClass, const char *pszNameFmt, ...)
+{
+    AssertReturn(!(fFlags & ~RTSEMRW_FLAGS_NO_LOCK_VAL), VERR_INVALID_PARAMETER);
+
+    /*
+     * Allocate handle.
+     */
     int rc;
-
-    /*
-     * Allocate handle.
-     */
     struct RTSEMRWINTERNAL *pThis = (struct RTSEMRWINTERNAL *)RTMemAlloc(sizeof(struct RTSEMRWINTERNAL));
     if (pThis)
@@ -126 +129 @@
                 pThis->Writer       = (pthread_t)-1;
 #ifdef RTSEMRW_STRICT
-                RTLockValidatorRecExclInit(&pThis->ValidatorWrite, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_NONE, pThis,
-                                           true /*fEnabled*/, "RTSemRW");
-                RTLockValidatorRecSharedInit(&pThis->ValidatorRead, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_NONE, pThis,
-                                             false /*fSignaller*/, true /*fEnabled*/, "RTSemEvent");
+                bool const fLVEnabled = !(fFlags & RTSEMRW_FLAGS_NO_LOCK_VAL);
+                va_list va;
+                va_start(va, pszNameFmt);
+                RTLockValidatorRecExclInit(&pThis->ValidatorWrite, hClass, uSubClass, pThis, fLVEnabled, pszNameFmt);
+                va_end(va);
+                va_start(va, pszNameFmt);
+                RTLockValidatorRecSharedInit(&pThis->ValidatorRead, hClass, uSubClass, pThis, false /*fSignaller*/,
+                                             fLVEnabled, pszNameFmt);
+                va_end(va);
                 RTLockValidatorRecMakeSiblings(&pThis->ValidatorWrite.Core, &pThis->ValidatorRead.Core);
 #endif
-                *pRWSem = pThis;
+                *phRWSem = pThis;
                 return VINF_SUCCESS;
             }
@@ -186 +194 @@
 
     return rc;
+}
+
+
+RTDECL(uint32_t) RTSemRWSetSubClass(RTSEMRW hRWSem, uint32_t uSubClass)
+{
+#ifdef RTSEMRW_STRICT
+    /*
+     * Validate handle.
+     */
+    struct RTSEMRWINTERNAL *pThis = hRWSem;
+    AssertPtrReturn(pThis, RTLOCKVAL_SUB_CLASS_INVALID);
+    AssertReturn(pThis->u32Magic == RTSEMRW_MAGIC, RTLOCKVAL_SUB_CLASS_INVALID);
+
+    RTLockValidatorRecSharedSetSubClass(&pThis->ValidatorRead, uSubClass);
+    return RTLockValidatorRecExclSetSubClass(&pThis->ValidatorWrite, uSubClass);
+#else
+    return RTLOCKVAL_SUB_CLASS_INVALID;
+#endif
 }
 
@@ -289 +315 @@
 
 
+#undef RTSemRWRequestRead
 RTDECL(int) RTSemRWRequestRead(RTSEMRW RWSem, unsigned cMillies)
 {
@@ -307 +334 @@
 
 
+#undef RTSemRWRequestReadNoResume
 RTDECL(int) RTSemRWRequestReadNoResume(RTSEMRW RWSem, unsigned cMillies)
 {
@@ -483 +511 @@
 
 
+#undef RTSemRWRequestWrite
 RTDECL(int) RTSemRWRequestWrite(RTSEMRW RWSem, unsigned cMillies)
 {
@@ -501 +530 @@
 
 
+#undef RTSemRWRequestWriteNoResume
 RTDECL(int) RTSemRWRequestWriteNoResume(RTSEMRW RWSem, unsigned cMillies)
 {