Changeset 24090 in vbox for trunk

Timestamp:

Oct 26, 2009 4:17:35 PM (15 years ago)

Author:

vboxsync

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

53968

Message:

Main/Machine: when opening a new session, don't just fail of the previous session wasn't closed completely. Better wait a little, as normally it takes much less than half a second to clean it up. The client could retry, but usually that would be much slower as the client has no knowledge about when the session is closed.

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3764 +3764 @@
     LogFlowThisFunc(("mSession.mState=%s\n", Global::stringifySessionState(mData->mSession.mState)));
 
+    /* Hack: in case the session is closing and there is a progress object
+     * which allows waiting for the session to be closed, take the opportunity
+     * and do a limited wait (max. 1 second). This helps a lot when the system
+     * is busy and thus session closing can take a little while. */
+    if (    mData->mSession.mState == SessionState_Closing
+        &&  mData->mSession.mProgress)
+    {
+        alock.leave();
+        mData->mSession.mProgress->WaitForCompletion(1000);
+        alock.enter();
+        LogFlowThisFunc(("after waiting: mSession.mState=%s\n", Global::stringifySessionState(mData->mSession.mState)));
+    }
+
     if (mData->mSession.mState == SessionState_Open ||
         mData->mSession.mState == SessionState_Closing)