Changeset 49502 in vbox

Timestamp:

Nov 15, 2013 1:11:13 PM (11 years ago)

Author:

vboxsync

Message:

FE/VBoxManage: GuestCtrl: Don't use signal handlers for closing active guest sessions.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (12 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -63 +63 @@
 using namespace com;
 
-/** Set by the signal handler. */
-static volatile bool         g_fGuestCtrlCanceled = false;
-/** Our global session object which is also used in the
- *  signal handler to abort operations properly. */
-static ComPtr<IGuestSession> g_pGuestSession = NULL;
+/** Set by the signal handler when current guest control
+ *  action shall be aborted. */
+static volatile bool g_fGuestCtrlCanceled = false;
 
 /**
@@ -403 +401 @@
         case CTRL_C_EVENT:
             ASMAtomicWriteBool(&g_fGuestCtrlCanceled, true);
-            if (!g_pGuestSession.isNull())
-                g_pGuestSession->Close();
             fEventHandled = TRUE;
             break;
@@ -419 +415 @@
  *
  * This can be executed on any thread in the process, on Windows it may even be
- * a thread dedicated to delivering this signal.  Do not doing anything
+ * a thread dedicated to delivering this signal.  Don't do anything
  * unnecessary here.
  */
@@ -426 +422 @@
     NOREF(iSignal);
     ASMAtomicWriteBool(&g_fGuestCtrlCanceled, true);
-    if (!g_pGuestSession.isNull())
-        g_pGuestSession->Close();
 }
 #endif
@@ -727 +721 @@
                      && pCtx->fVerbose)
                 RTPrintf("Guest session detached\n");
-
+#ifdef DEBUG
+            ULONG cRefs = pCtx->pGuestSession->AddRef();
+            RTPrintf("cRefs=%RU32\n", cRefs - 1);
+            pCtx->pGuestSession->Release();
+#endif
             pCtx->pGuestSession.setNull();
         }
 
-        g_pGuestSession.setNull();
         if (pCtx->handlerArg.session)
             CHECK_ERROR(pCtx->handlerArg.session, UnlockMachine());
@@ -992 +989 @@
                 && !(uFlags & CTLCMDCTX_FLAGS_NO_SIGNAL_HANDLER))
             {
-                /* Add session to global for being accessible by the
-                 * signal handler. */
-                g_pGuestSession = pCtx->pGuestSession;
-
                 ctrlSignalHandlerInstall();
             }
@@ -1341 +1334 @@
                 cMsTimeLeft = ctrlExecGetRemainingTime(u64StartMS, cMsTimeout);
                 CHECK_ERROR_BREAK(pProcess, WaitForArray(ComSafeArrayAsInParam(aWaitFlags),
-                                                         cMsTimeLeft, &waitResult));
+                                                         500 /* ms */, &waitResult));
                 switch (waitResult)
                 {
@@ -1374 +1367 @@
                         break;
                     }
+                    case ProcessWaitResult_Timeout:
+                        /* Fall through is intentional. */
                     default:
                         /* Ignore all other results, let the timeout expire */
@@ -1467 +1462 @@
          */
         fCloseSession = !fDetached;
+
+        /* 
+         * If execution was aborted from the host side (signal handler), 
+         * close the guest session in any case. 
+         */ 
+        if (g_fGuestCtrlCanceled)
+            fCloseSession = true;
     }
     else /* Close session on error. */
@@ -3726 +3728 @@
     HRESULT rc = S_OK;
 
-    ComPtr<IGuestSession> pSession;
     do
     {
@@ -3738 +3739 @@
         for (size_t i = 0; i < cSessions; i++)
         {
-            pSession = collSessions[i];
+            ComPtr<IGuestSession> pSession = collSessions[i];
             Assert(!pSession.isNull());
 
@@ -3769 +3770 @@
                     RTPrintf("Guest session successfully closed\n");
 
-                pSession->Release();
+                pSession.setNull();
             }
         }