Changeset 7992 in vbox for trunk/src/VBox/Main/include/VirtualBoxBase.h

Timestamp:

Apr 15, 2008 1:53:12 PM (17 years ago)

Author:

vboxsync

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

29646

Message:

Main: Implemented true AutoReaderLock (#2768).

File:

• trunk/src/VBox/Main/include/VirtualBoxBase.h (modified) (12 diffs)

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

@@ -31 +31 @@
 
 using namespace com;
-using util::AutoLock;
-using util::AutoReaderLock;
-using util::AutoMultiLock;
+using namespace util;
 
 #include <iprt/cdefs.h>
@@ -438 +436 @@
     : public CComObjectRootEx
 #endif
-    , public AutoLock::Lockable
+    , public Lockable
 {
 public:
@@ -452 +450 @@
 
     // AutoLock::Lockable interface
-    virtual AutoLock::Handle *lockHandle() const;
+    virtual RWLockHandle *lockHandle() const;
 
     /**
@@ -863 +861 @@
     };
 
+    /**
+     * Returns a lock handle used to protect the primary state fields (used by
+     * #addCaller(), AutoInitSpan, AutoUninitSpan, etc.). Only intended to be
+     * used for similar purposes in subclasses. WARNING: NO any other locks may
+     * be requested while holding this lock!
+     */
+    WriteLockHandle *stateLockHandle() { return &mStateLock; }
+
 private:
 
@@ -886 +892 @@
 
     /** Protects access to state related data members */
-    RTCRITSECT mStateLock;
+    WriteLockHandle mStateLock;
 
     /** User-level object lock for subclasses */
-    mutable AutoLock::Handle *mObjectLock;
+    mutable RWLockHandle *mObjectLock;
 };
 
@@ -1619 +1625 @@
     VirtualBoxBaseWithChildren()
         : mUninitDoneSem (NIL_RTSEMEVENT), mChildrenLeft (0)
-    {
-        RTCritSectInit (&mMapLock);
-    }
+    {}
 
     virtual ~VirtualBoxBaseWithChildren()
-    {
-        RTCritSectDelete (&mMapLock);
-    }
+    {}
 
     /**
@@ -1680 +1682 @@
     DependentChildren mDependentChildren;
 
-    RTCRITSECT mMapLock;
+    WriteLockHandle mMapLock;
+
     RTSEMEVENT mUninitDoneSem;
     unsigned mChildrenLeft;
@@ -1825 +1828 @@
 
     /* Protects all the fields above */
-    AutoLock::Handle mMapLock;
+    RWLockHandle mMapLock;
 };
 
@@ -1907 +1910 @@
      *  </code>
      */
-    AutoLock::Handle &dependentChildrenLock() const { return mMapLock; }
+    RWLockHandle *dependentChildrenLock() const { return &mMapLock; }
 
     /**
@@ -1975 +1978 @@
 
     bool mInUninit;
-    mutable AutoLock::Handle mMapLock;
+    mutable RWLockHandle mMapLock;
 };
 
@@ -2063 +2066 @@
      * </code>
      */
-    AutoLock::Handle &dependentChildrenLock() const { return mMapLock; }
+    RWLockHandle *dependentChildrenLock() const { return &mMapLock; }
 
     /**
@@ -2097 +2100 @@
 
     /* Protects the two fields above */
-    mutable AutoLock::Handle mMapLock;
+    mutable RWLockHandle mMapLock;
 };