Changeset 75660 in vbox for trunk/src/VBox/Main/include

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.

Location:

trunk/src/VBox/Main/include

Files:

• AutoCaller.h (modified) (3 diffs)
• ObjectState.h (modified) (1 diff)

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

@@ -476 +476 @@
 public:
 
-    AutoUninitSpan(VirtualBoxBase *aObj);
+    AutoUninitSpan(VirtualBoxBase *aObj, bool fTry = false);
     ~AutoUninitSpan();
 
@@ -484 +484 @@
     /** |true| when uninit() has already been called (so the object is NotReady) */
     bool uninitDone() { return mUninitDone; }
+
+    /** |true| when uninit() has failed, relevant only if it was a "try uninit" */
+    bool uninitFailed() { return mUninitFailed; }
 
     void setSucceeded();
@@ -495 +498 @@
     bool mInitFailed : 1;
     bool mUninitDone : 1;
+    bool mUninitFailed : 1;
 };
 

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

@@ -99 +99 @@
     bool autoInitSpanConstructor(State aExpectedState);
     void autoInitSpanDestructor(State aNewState, HRESULT aFailedRC, com::ErrorInfo *aFailedEI);
-    State autoUninitSpanConstructor();
+    State autoUninitSpanConstructor(bool fTry);
     void autoUninitSpanDestructor();