Changeset 48431 in vbox for trunk/src/VBox/Main/src-server/TokenImpl.cpp

Timestamp:

Sep 11, 2013 2:08:36 PM (11 years ago)

Author:

vboxsync

Message:

Main/Machine+Session: New generic client session watcher implementation based on token objects, works on all platforms and is used for now on XPCOM. Additionally a better error message when several API clients are racing for a lock, previously it could be quite confusing.

File:

• trunk/src/VBox/Main/src-server/TokenImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/TokenImpl.cpp

@@ -35 +35 @@
 void MachineToken::FinalRelease()
 {
-    uninit();
+    uninit(false);
 
     BaseFinalRelease();
@@ -70 +70 @@
  * Called either from FinalRelease() or by the parent when it gets destroyed.
  */
-void MachineToken::uninit()
+void MachineToken::uninit(bool fAbandon)
 {
     LogFlowThisFunc(("\n"));
@@ -82 +82 @@
     if (!m.pSessionMachine.isNull())
     {
-        m.pSessionMachine->uninit();
+        m.pSessionMachine->uninit(fAbandon ? SessionMachine::Uninit::Normal : SessionMachine::Uninit::Abnormal);
         m.pSessionMachine.setNull();
     }
@@ -96 +96 @@
 
     /* uninit does everything we need */
-    uninit();
+    uninit(true);
     return S_OK;
 }