Changeset 57134 in vbox

Timestamp:

Jul 30, 2015 5:56:59 PM (10 years ago)

Author:

vboxsync

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

101875

Message:

Main/Machine: fix session state checking helpers (properly distinguishing "only VM sessions" from "all sessions"), to hopefully fix the Windows session crash detection

Location:

trunk/src/VBox/Main

Files:

• include/MachineImpl.h (modified) (2 diffs)
• src-server/MachineImpl.cpp (modified) (3 diffs)
• src-server/VirtualBoxImpl.cpp (modified) (2 diffs)

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

@@ -566 +566 @@
     bool i_isSessionOpen(ComObjPtr<SessionMachine> &aMachine,
                          ComPtr<IInternalSessionControl> *aControl = NULL,
+                         bool aRequireVM = false,
                          bool aAllowClosing = false);
     bool i_isSessionSpawning();
@@ -571 +572 @@
     bool i_isSessionOpenOrClosing(ComObjPtr<SessionMachine> &aMachine,
                                   ComPtr<IInternalSessionControl> *aControl = NULL)
-    { return i_isSessionOpen(aMachine, aControl, true /* aAllowClosing */); }
+    { return i_isSessionOpen(aMachine, aControl, false /* aRequireVM */, true /* aAllowClosing */); }
+
+    bool i_isSessionOpenVM(ComObjPtr<SessionMachine> &aMachine,
+                           ComPtr<IInternalSessionControl> *aControl = NULL)
+    { return i_isSessionOpen(aMachine, aControl, true /* aRequireVM */, false /* aAllowClosing */); }
 
     bool i_checkForSpawnFailure();

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

@@ -7747 +7747 @@
  * @param aMachine      Session machine object.
  * @param aControl      Direct session control object (optional).
+ * @param aRequireVM    If true then only allow VM sessions.
  * @param aAllowClosing If true then additionally a session which is currently
  *                      being closed will also be allowed.
@@ -7754 +7755 @@
 bool Machine::i_isSessionOpen(ComObjPtr<SessionMachine> &aMachine,
                               ComPtr<IInternalSessionControl> *aControl /*= NULL*/,
+                              bool aRequireVM /*= false*/,
                               bool aAllowClosing /*= false*/)
 {
@@ -7766 +7768 @@
 
     if (    (   mData->mSession.mState == SessionState_Locked
-             && mData->mSession.mLockType == LockType_VM)
+             && (!aRequireVM || mData->mSession.mLockType == LockType_VM))
          || (aAllowClosing && mData->mSession.mState == SessionState_Unlocking)
        )

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

@@ -3036 +3036 @@
 
 /**
- * Returns the list of opened machines (machines having direct sessions opened
- * by client processes) and optionally the list of direct session controls.
+ * Returns the list of opened machines (machines having VM sessions opened,
+ * ignoring other sessions) and optionally the list of direct session controls.
  *
  * @param aMachines     Where to put opened machines (will be empty if none).
@@ -3069 +3069 @@
         ComObjPtr<SessionMachine> sm;
         ComPtr<IInternalSessionControl> ctl;
-        if ((*it)->i_isSessionOpen(sm, &ctl))
+        if ((*it)->i_isSessionOpenVM(sm, &ctl))
         {
             aMachines.push_back(sm);