Changeset 75660 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Nov 22, 2018 12:20:52 PM (6 years ago)

Author:

vboxsync

Message:

Main/AutoCaller: add a "try lock" option to AutoUninitSpan, for situations where the uninit should fail when there are still callers active.

File:

• trunk/src/VBox/Main/src-all/AutoCaller.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-all/AutoCaller.cpp

@@ -313 +313 @@
 }
 
-ObjectState::State ObjectState::autoUninitSpanConstructor()
+ObjectState::State ObjectState::autoUninitSpanConstructor(bool fTry)
 {
     AutoWriteLock stateLock(mStateLock COMMA_LOCKVAL_SRC_POS);
@@ -330 +330 @@
          * returns, the object state is well-defined (NotReady). */
 
+        if (fTry)
+            return Ready;
+
         /* lazy semaphore creation */
         if (mInitUninitSem == NIL_RTSEMEVENTMULTI)
@@ -361 +364 @@
     if (mCallers > 0)
     {
+        if (fTry)
+            return Ready;
+
         /* lazy creation */
         Assert(mZeroCallersSem == NIL_RTSEMEVENT);
@@ -518 +524 @@
  * @param aObj  |this| pointer of the VirtualBoxBase object whose uninit()
  *              method is being called.
- */
-AutoUninitSpan::AutoUninitSpan(VirtualBoxBase *aObj)
+ * @param fTry  @c true if the wait for other callers should be skipped,
+ *              requiring checking if the uninit span is actually operational.
+ */
+AutoUninitSpan::AutoUninitSpan(VirtualBoxBase *aObj, bool fTry /* = false */)
     : mObj(aObj),
       mInitFailed(false),
-      mUninitDone(false)
+      mUninitDone(false),
+      mUninitFailed(false)
 {
     Assert(mObj);
     ObjectState::State state;
-    state = mObj->getObjectState().autoUninitSpanConstructor();
+    state = mObj->getObjectState().autoUninitSpanConstructor(fTry);
     if (state == ObjectState::InitFailed)
         mInitFailed = true;
     else if (state == ObjectState::NotReady)
         mUninitDone = true;
+    else if (state == ObjectState::Ready)
+        mUninitFailed = true;
 }
 
@@ -539 +550 @@
 {
     /* do nothing if already uninitialized */
-    if (mUninitDone)
+    if (mUninitDone || mUninitFailed)
         return;
 
@@ -553 +564 @@
 {
     /* do nothing if already uninitialized */
-    if (mUninitDone)
+    if (mUninitDone || mUninitFailed)
         return;