Changeset 8119 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 17, 2008 6:26:08 PM (17 years ago)

Author:

vboxsync

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

29822

Message:

Main: AutoLock: Switched to RTSemRW on POSIX platforms but disabled until missing RTSemRW bits are done.

Location:

trunk/src/VBox/Main

Files:

• AutoLock.cpp (modified) (6 diffs)
• Makefile.kmk (modified) (1 diff)
• include/AutoLock.h (modified) (3 diffs)

trunk/src/VBox/Main/AutoLock.cpp

@@ -25 +25 @@
 RWLockHandle::RWLockHandle()
 {
-    RTCritSectInit (&mCritSect);
-    RTSemEventCreate (&mGoWriteSem);
-    RTSemEventMultiCreate (&mGoReadSem);
+#ifdef VBOX_MAIN_USE_SEMRW
+
+    int vrc = RTSemRWCreate (&mSemRW);
+    AssertRC (vrc);
+
+#else /* VBOX_MAIN_USE_SEMRW */
+
+    int vrc = RTCritSectInit (&mCritSect);
+    AssertRC (vrc);
+    vrc = RTSemEventCreate (&mGoWriteSem);
+    AssertRC (vrc);
+    vrc = RTSemEventMultiCreate (&mGoReadSem);
+    AssertRC (vrc);
 
     mWriteLockThread = NIL_RTTHREAD;
@@ -34 +44 @@
     mWriteLockLevel = 0;
     mWriteLockPending = 0;
+
+#endif /* VBOX_MAIN_USE_SEMRW */
 }
 
 RWLockHandle::~RWLockHandle()
 {
+#ifdef VBOX_MAIN_USE_SEMRW
+
+    RTSemRWDestroy (mSemRW);
+
+#else /* VBOX_MAIN_USE_SEMRW */
+
     RTSemEventMultiDestroy (mGoReadSem);
     RTSemEventDestroy (mGoWriteSem);
     RTCritSectDelete (&mCritSect);
+
+#endif /* VBOX_MAIN_USE_SEMRW */
 }
 
 bool RWLockHandle::isWriteLockOnCurrentThread() const
 {
+#ifdef VBOX_MAIN_USE_SEMRW
+
+    return RTSemRWIsWriteOwner (mSemRW);
+
+#else /* VBOX_MAIN_USE_SEMRW */
+
     RTCritSectEnter (&mCritSect);
     bool locked = mWriteLockThread == RTThreadSelf();
     RTCritSectLeave (&mCritSect);
     return locked;
+
+#endif /* VBOX_MAIN_USE_SEMRW */
 }
 
 void RWLockHandle::lockWrite()
 {
+#ifdef VBOX_MAIN_USE_SEMRW
+
+    int vrc = RTSemRWRequestWrite (mSemRW, RT_INDEFINITE_WAIT);
+    AssertRC (vrc);
+
+#else /* VBOX_MAIN_USE_SEMRW */
+
     RTCritSectEnter (&mCritSect);
 
@@ -79 +114 @@
 
     RTCritSectLeave (&mCritSect);
+
+#endif /* VBOX_MAIN_USE_SEMRW */
 }
 
 void RWLockHandle::unlockWrite()
 {
+#ifdef VBOX_MAIN_USE_SEMRW
+
+    int vrc = RTSemRWReleaseWrite (mSemRW);
+    AssertRC (vrc);
+
+#else /* VBOX_MAIN_USE_SEMRW */
+
     RTCritSectEnter (&mCritSect);
 
@@ -103 +147 @@
 
     RTCritSectLeave (&mCritSect);
+
+#endif /* VBOX_MAIN_USE_SEMRW */
 }
 
 void RWLockHandle::lockRead()
 {
+#ifdef VBOX_MAIN_USE_SEMRW
+
+    int vrc = RTSemRWRequestRead (mSemRW, RT_INDEFINITE_WAIT);
+    AssertRC (vrc);
+
+#else /* VBOX_MAIN_USE_SEMRW */
+
     RTCritSectEnter (&mCritSect);
 
@@ -146 +199 @@
     if (isWriteLock)
         RTSemEventMultiWait (mGoReadSem, RT_INDEFINITE_WAIT);
+
+#endif /* VBOX_MAIN_USE_SEMRW */
 }
 
 void RWLockHandle::unlockRead()
 {
+#ifdef VBOX_MAIN_USE_SEMRW
+
+    int vrc = RTSemRWReleaseRead (mSemRW);
+    AssertRC (vrc);
+
+#else /* VBOX_MAIN_USE_SEMRW */
+
     RTCritSectEnter (&mCritSect);
 
@@ -177 +239 @@
 
     RTCritSectLeave (&mCritSect);
+
+#endif /* VBOX_MAIN_USE_SEMRW */
 }
 
 uint32_t RWLockHandle::writeLockLevel() const
 {
+#ifdef VBOX_MAIN_USE_SEMRW
+
+    return RTSemRWGetWriteRecursion (mSemRW);
+
+#else /* VBOX_MAIN_USE_SEMRW */
+
     Assert (mWriteLockLevel != 0);
 
     return mWriteLockLevel;
+
+#endif /* VBOX_MAIN_USE_SEMRW */
 }
 

trunk/src/VBox/Main/Makefile.kmk

@@ -49 +49 @@
  VBOX_MAIN_DEFS += VBOX_WITH_UNIXY_TAP_NETWORKING
 endif
+## @todo later when RTSemRWIsWriteOwner and RTSemRWGetWriteRecursion are done
+#ifeq ($(filter-out linux darwin freebsd solaris,$(BUILD_TARGET)),)
+# VBOX_MAIN_DEFS += VBOX_MAIN_USE_SEMRW
+#endif
+
 ## @todo eliminate or expand VBOX_MAIN_DEFS.
 

trunk/src/VBox/Main/include/AutoLock.h

@@ -25 +25 @@
 #include <iprt/semaphore.h>
 
+#include <iprt/err.h>
 #include <iprt/assert.h>
 
 #if defined(DEBUG)
 # include <iprt/asm.h> // for ASMReturnAddress
+#endif
+
+#ifdef VBOX_MAIN_USE_SEMRW
+# include <iprt/semaphore.h>
 #endif
 
@@ -172 +177 @@
     uint32_t writeLockLevel() const;
 
+#ifdef VBOX_MAIN_USE_SEMRW
+
+    RTSEMRW mSemRW;
+
+#else /* VBOX_MAIN_USE_SEMRW */
+
     mutable RTCRITSECT mCritSect;
     RTSEMEVENT mGoWriteSem;
@@ -181 +192 @@
     uint32_t mWriteLockLevel;
     uint32_t mWriteLockPending;
+
+#endif /* VBOX_MAIN_USE_SEMRW */
 };