Changeset 13696 in vbox

Timestamp:

Oct 30, 2008 9:58:59 PM (16 years ago)

Author:

vboxsync

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

38661

Message:

Main: Fixed: Closing sessions was not always noticed by the server which caused a hang during poweroff (regression after adding spawning session watchdog).

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3834 +3834 @@
 #if defined (RT_OS_WINDOWS)
 bool Machine::isSessionOpen (ComObjPtr <SessionMachine> &aMachine,
-                             HANDLE *aIPCSem /*= NULL*/)
+                             HANDLE *aIPCSem /*= NULL*/,
+                             bool aAllowClosing /*= false*/)
 #elif defined (RT_OS_OS2)
 bool Machine::isSessionOpen (ComObjPtr <SessionMachine> &aMachine,
-                             HMTX *aIPCSem /*= NULL*/);
+                             HMTX *aIPCSem /*= NULL*/,
+                             bool aAllowClosing /*= false*/);
 #else
-bool Machine::isSessionOpen (ComObjPtr <SessionMachine> &aMachine)
+bool Machine::isSessionOpen (ComObjPtr <SessionMachine> &aMachine,
+                             bool aAllowClosing /*= false*/)
 #endif
 {
@@ -3851 +3854 @@
     AutoReadLock alock (this);
 
-    if (mData->mSession.mState == SessionState_Open)
+    if (mData->mSession.mState == SessionState_Open ||
+        (aAllowClosing && mData->mSession.mState == SessionState_Closing))
     {
         AssertReturn (!mData->mSession.mMachine.isNull(), false);

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -4071 +4071 @@
                     ComObjPtr <SessionMachine> sm;
                     HANDLE ipcSem;
-                    if ((*it)->isSessionOpen (sm, &ipcSem))
+                    if ((*it)->isSessionOpenOrClosing (sm, &ipcSem))
                     {
                         machines.push_back (sm);
@@ -4263 +4263 @@
                         ComObjPtr <SessionMachine> sm;
                         HMTX ipcSem;
-                        if ((*it)->isSessionOpen (sm, &ipcSem))
+                        if ((*it)->isSessionOpenOrClosing (sm, &ipcSem))
                         {
                             machines.push_back (sm);
@@ -4356 +4356 @@
                     {
                         ComObjPtr <SessionMachine> sm;
-                        if ((*it)->isSessionOpen (sm))
+                        if ((*it)->isSessionOpenOrClosing (sm))
                             machines.push_back (sm);
                     }

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

@@ -634 +634 @@
 
 #if defined (RT_OS_WINDOWS)
+
     bool isSessionOpen (ComObjPtr <SessionMachine> &aMachine,
-                        HANDLE *aIPCSem = NULL);
+                        HANDLE *aIPCSem = NULL, bool aAllowClosing = false);
     bool isSessionSpawning (RTPROCESS *aPID = NULL);
+
+    bool isSessionOpenOrClosing (ComObjPtr <SessionMachine> &aMachine,
+                                 HANDLE *aIPCSem = NULL)
+    { return isSessionOpen (aMachine, aIPCSem, true /* aAllowClosing */); }
+
 #elif defined (RT_OS_OS2)
+
     bool isSessionOpen (ComObjPtr <SessionMachine> &aMachine,
-                        HMTX *aIPCSem = NULL);
+                        HMTX *aIPCSem = NULL, bool aAllowClosing = false);
+
     bool isSessionSpawning (RTPROCESS *aPID = NULL);
+
+    bool isSessionOpenOrClosing (ComObjPtr <SessionMachine> &aMachine,
+                                 HMTX *aIPCSem = NULL)
+    { return isSessionOpen (aMachine, aIPCSem, true /* aAllowClosing */); }
+
 #else
-    bool isSessionOpen (ComObjPtr <SessionMachine> &aMachine);
+
+    bool isSessionOpen (ComObjPtr <SessionMachine> &aMachine,
+                        bool aAllowClosing = false);
     bool isSessionSpawning();
+
+    bool isSessionOpenOrClosing (ComObjPtr <SessionMachine> &aMachine)
+    { return isSessionOpen (aMachine, true /* aAllowClosing */); }
+
 #endif
 
@@ -942 +961 @@
     Bstr mIPCSemName;
     friend bool Machine::isSessionOpen (ComObjPtr <SessionMachine> &aMachine,
-                                        HANDLE *aIPCSem);
+                                        HANDLE *aIPCSem, bool aAllowClosing);
 #elif defined (RT_OS_OS2)
     HMTX mIPCSem;
     Bstr mIPCSemName;
     friend bool Machine::isSessionOpen (ComObjPtr <SessionMachine> &aMachine,
-                                        HMTX *aIPCSem);
+                                        HMTX *aIPCSem, bool aAllowClosing);
 #elif defined (VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
     int mIPCSem;