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

Timestamp:

Dec 31, 2009 1:21:39 PM (15 years ago)

Author:

vboxsync

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

56298

Message:

iprt,pdmcritsect: Shortening and cleaning up the lock validator structure names.

Location:

trunk/src/VBox/Runtime/r3/posix

Files:

• semmutex-posix.cpp (modified) (8 diffs)
• semrw-posix.cpp (modified) (9 diffs)

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

@@ -66 +66 @@
 #ifdef RTSEMMUTEX_STRICT
     /** Lock validator record associated with this mutex. */
-    RTLOCKVALIDATORREC  ValidatorRec;
+    RTLOCKVALRECEXCL    ValidatorRec;
 #endif
 };
@@ -102 +102 @@
                 pThis->u32Magic = RTSEMMUTEX_MAGIC;
 #ifdef RTSEMMUTEX_STRICT
-                RTLockValidatorRecInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemMutex", pThis);
+                RTLockValidatorRecExclInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemMutex", pThis);
 #endif
 
@@ -147 +147 @@
     pThis->cNesting = UINT32_MAX;
 #ifdef RTSEMMUTEX_STRICT
-    RTLockValidatorRecDelete(&pThis->ValidatorRec);
+    RTLockValidatorRecExclDelete(&pThis->ValidatorRec);
 #endif
     RTMemTmpFree(pThis);
@@ -155 +155 @@
 
 
-DECL_FORCE_INLINE(int) rtSemMutexRequest(RTSEMMUTEX MutexSem, unsigned cMillies, PCRTLOCKVALIDATORSRCPOS pSrcPos)
+DECL_FORCE_INLINE(int) rtSemMutexRequest(RTSEMMUTEX MutexSem, unsigned cMillies, PCRTLOCKVALSRCPOS pSrcPos)
 {
     /*
@@ -259 +259 @@
     return rtSemMutexRequest(MutexSem, cMillies, NULL);
 #else
-    RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_NORMAL_API();
+    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_NORMAL_API();
     return rtSemMutexRequest(MutexSem, cMillies, &SrcPos);
 #endif
@@ -267 +267 @@
 RTDECL(int) RTSemMutexRequestDebug(RTSEMMUTEX MutexSem, unsigned cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
 {
-    RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_DEBUG_API();
+    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_DEBUG_API();
     return rtSemMutexRequest(MutexSem, cMillies, &SrcPos);
 }
@@ -278 +278 @@
     return rtSemMutexRequest(MutexSem, cMillies, NULL);
 #else
-    RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_NORMAL_API();
+    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_NORMAL_API();
     return rtSemMutexRequest(MutexSem, cMillies, &SrcPos);
 #endif
@@ -286 +286 @@
 RTDECL(int) RTSemMutexRequestNoResumeDebug(RTSEMMUTEX MutexSem, unsigned cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
 {
-    RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_DEBUG_API();
+    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_DEBUG_API();
     return rtSemMutexRequest(MutexSem, cMillies, &SrcPos);
 }

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

@@ -86 +86 @@
 #ifdef RTSEMRW_STRICT
     /** The validator record for the writer. */
-    RTLOCKVALIDATORREC      ValidatorWrite;
+    RTLOCKVALRECEXCL    ValidatorWrite;
     /** The validator record for the readers. */
-    RTLOCKVALIDATORSHARED   ValidatorRead;
+    RTLOCKVALRECSHRD    ValidatorRead;
 #endif
 };
@@ -119 +119 @@
                 pThis->Writer       = (pthread_t)-1;
 #ifdef RTSEMRW_STRICT
-                RTLockValidatorRecInit(&pThis->ValidatorWrite, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemRW", pThis);
-                RTLockValidatorSharedRecInit(&pThis->ValidatorRead,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemRW", pThis);
-                RTLockValidatorMakeSiblings(&pThis->ValidatorWrite.Core, &pThis->ValidatorRead.Core);
+                RTLockValidatorRecExclInit(&pThis->ValidatorWrite, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemRW", pThis);
+                RTLockValidatorRecSharedInit(&pThis->ValidatorRead,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemRW", pThis);
+                RTLockValidatorRecMakeSiblings(&pThis->ValidatorWrite.Core, &pThis->ValidatorRead.Core);
 #endif
                 *pRWSem = pThis;
@@ -163 +163 @@
     {
 #ifdef RTSEMRW_STRICT
-        RTLockValidatorSharedRecDelete(&pThis->ValidatorRead);
-        RTLockValidatorRecDelete(&pThis->ValidatorWrite);
+        RTLockValidatorRecSharedDelete(&pThis->ValidatorRead);
+        RTLockValidatorRecExclDelete(&pThis->ValidatorWrite);
 #endif
         RTMemFree(pThis);
@@ -182 +182 @@
 RTDECL(int) RTSemRWRequestRead(RTSEMRW RWSem, unsigned cMillies)
 {
-    PRTLOCKVALIDATORSRCPOS pSrcPos = NULL;
+    PRTLOCKVALSRCPOS pSrcPos = NULL;
 
     /*
@@ -346 +346 @@
 
 
-DECL_FORCE_INLINE(int) rtSemRWRequestWrite(RTSEMRW RWSem, unsigned cMillies, PCRTLOCKVALIDATORSRCPOS pSrcPos)
+DECL_FORCE_INLINE(int) rtSemRWRequestWrite(RTSEMRW RWSem, unsigned cMillies, PCRTLOCKVALSRCPOS pSrcPos)
 {
     /*
@@ -452 +452 @@
     return rtSemRWRequestWrite(RWSem, cMillies, NULL);
 #else
-    RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_NORMAL_API();
+    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_NORMAL_API();
     return rtSemRWRequestWrite(RWSem, cMillies, &SrcPos);
 #endif
@@ -460 +460 @@
 RTDECL(int) RTSemRWRequestWriteDebug(RTSEMRW RWSem, unsigned cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
 {
-    RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_DEBUG_API();
+    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_DEBUG_API();
     return rtSemRWRequestWrite(RWSem, cMillies, &SrcPos);
 }
@@ -471 +471 @@
     return rtSemRWRequestWrite(RWSem, cMillies, NULL);
 #else
-    RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_NORMAL_API();
+    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_NORMAL_API();
     return rtSemRWRequestWrite(RWSem, cMillies, &SrcPos);
 #endif
@@ -480 +480 @@
 {
     /* EINTR isn't returned by the wait functions we're using. */
-    RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_DEBUG_API();
+    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_DEBUG_API();
     return rtSemRWRequestWrite(RWSem, cMillies, &SrcPos);
 }