Changeset 45127 in vbox

Timestamp:

Mar 21, 2013 2:42:22 PM (12 years ago)

Author:

vboxsync

Message:

AutoLock.cpp: Try the new read/write critical section.

File:

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

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

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * Automatic locks, implementation
+ * Automatic locks, implementation.
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
  */
 
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+#define GLUE_USE_CRITSECTRW
+
+
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 #include <iprt/cdefs.h>
 #include <iprt/critsect.h>
@@ -38 +48 @@
 #include <list>
 #include <map>
+
 
 namespace util
@@ -134 +145 @@
     { }
 
-    RTSEMRW                     sem;
-    VBoxLockingClass   lockClass;
-
-#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
-    com::Utf8Str                strDescription;
+#ifdef GLUE_USE_CRITSECTRW
+    mutable RTCRITSECTRW    CritSect;
+#else
+    RTSEMRW                 sem;
+#endif
+    VBoxLockingClass        lockClass;
+
+#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
+    com::Utf8Str            strDescription;
 #endif
 };
@@ -147 +162 @@
 
     m->lockClass = lockClass;
-
 #ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
     m->strDescription = com::Utf8StrFmt("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);
+# else
+    int vrc = RTCritSectRwInitEx(&m->CritSect, 0 /*fFlags*/, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_ANY, NULL);
+# endif
+#else
+# ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
     int vrc = RTSemRWCreateEx(&m->sem, 0 /*fFlags*/, g_mapLockValidationClasses[lockClass], RTLOCKVAL_SUB_CLASS_ANY, NULL);
-#else
+# else
     int vrc = RTSemRWCreateEx(&m->sem, 0 /*fFlags*/, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_ANY, NULL);
+# endif
 #endif
     AssertRC(vrc);
@@ -159 +184 @@
 /*virtual*/ RWLockHandle::~RWLockHandle()
 {
+#ifdef GLUE_USE_CRITSECTRW
+    RTCritSectRwDelete(&m->CritSect);
+#else
     RTSemRWDestroy(m->sem);
+#endif
     delete m;
 }
@@ -165 +194 @@
 /*virtual*/ bool RWLockHandle::isWriteLockOnCurrentThread() const
 {
+#ifdef GLUE_USE_CRITSECTRW
+    return RTCritSectRwIsWriteOwner(&m->CritSect);
+#else
     return RTSemRWIsWriteOwner(m->sem);
+#endif
 }
 
 /*virtual*/ void RWLockHandle::lockWrite(LOCKVAL_SRC_POS_DECL)
 {
-#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
+#ifdef GLUE_USE_CRITSECTRW
+# ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
+    int vrc = RTCritSectRwEnterExclDebug(&m->CritSect, (uintptr_t)ASMReturnAddress(), RT_SRC_POS_ARGS);
+# else
+    int vrc = RTCritSectRwEnterExcl(&m->CritSect);
+# endif
+#else
+# ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
     int vrc = RTSemRWRequestWriteDebug(m->sem, RT_INDEFINITE_WAIT, (uintptr_t)ASMReturnAddress(), RT_SRC_POS_ARGS);
-#else
+# else
     int vrc = RTSemRWRequestWrite(m->sem, RT_INDEFINITE_WAIT);
+# endif
 #endif
     AssertRC(vrc);
@@ -180 +221 @@
 /*virtual*/ void RWLockHandle::unlockWrite()
 {
+#ifdef GLUE_USE_CRITSECTRW
+    int vrc = RTCritSectRwLeaveExcl(&m->CritSect);
+#else
     int vrc = RTSemRWReleaseWrite(m->sem);
+#endif
     AssertRC(vrc);
 
@@ -187 +232 @@
 /*virtual*/ void RWLockHandle::lockRead(LOCKVAL_SRC_POS_DECL)
 {
-#ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
+#ifdef GLUE_USE_CRITSECTRW
+# ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
+    int vrc = RTCritSectRwEnterSharedDebug(&m->CritSect, (uintptr_t)ASMReturnAddress(), RT_SRC_POS_ARGS);
+# else
+    int vrc = RTCritSectRwEnterShared(&m->CritSect);
+# endif
+#else
+# ifdef VBOX_WITH_MAIN_LOCK_VALIDATION
     int vrc = RTSemRWRequestReadDebug(m->sem, RT_INDEFINITE_WAIT, (uintptr_t)ASMReturnAddress(), RT_SRC_POS_ARGS);
-#else
+# else
     int vrc = RTSemRWRequestRead(m->sem, RT_INDEFINITE_WAIT);
+# endif
 #endif
     AssertRC(vrc);
@@ -197 +250 @@
 /*virtual*/ void RWLockHandle::unlockRead()
 {
+#ifdef GLUE_USE_CRITSECTRW
+    int vrc = RTCritSectRwLeaveShared(&m->CritSect);
+#else
     int vrc = RTSemRWReleaseRead(m->sem);
+#endif
     AssertRC(vrc);
 }
@@ -204 +261 @@
 {
     /* Note! This does not include read recursions done by the writer! */
+#ifdef GLUE_USE_CRITSECTRW
+    return RTCritSectRwGetWriteRecursion(&m->CritSect);
+#else
     return RTSemRWGetWriteRecursion(m->sem);
+#endif
 }