Changeset 88990 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 11, 2021 10:56:28 PM (4 years ago)

Author:

vboxsync

Message:

FE/VBoxHeadless: VBOX_WITH_SAVESTATE_ON_SIGNAL - g/c well-intentioned
but overthunk signal handler. The signal will interrupt event queue
processing for us (NB: with VINF_SUCCESS), so just set the flag and
let the event loop see it and terminate. bugref:8161

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -60 +60 @@
 #ifdef VBOX_WITH_SAVESTATE_ON_SIGNAL
 #include <signal.h>
+static void HandleSignal(int sig);
 #endif
 
@@ -391 +392 @@
 
 #ifdef VBOX_WITH_SAVESTATE_ON_SIGNAL
-static void SaveState(int sig)
+static void
+HandleSignal(int sig)
 {
-    ComPtr <IProgress> progress = NULL;
-
-/** @todo Deal with nested signals, multithreaded signal dispatching (esp. on windows),
- * and multiple signals (both SIGINT and SIGTERM in some order).
- * Consider processing the signal request asynchronously since there are lots of things
- * which aren't safe (like RTPrintf and printf IIRC) in a signal context. */
-
-    RTPrintf("Signal received, saving state.\n");
-
-    HRESULT rc = gConsole->SaveState(progress.asOutParam());
-    if (FAILED(rc))
-    {
-        RTPrintf("Error saving state! rc = 0x%x\n", rc);
-        return;
-    }
-    Assert(progress);
-    LONG cPercent = 0;
-
-    RTPrintf("0%%");
-    RTStrmFlush(g_pStdOut);
-    for (;;)
-    {
-        BOOL fCompleted = false;
-        rc = progress->COMGETTER(Completed)(&fCompleted);
-        if (FAILED(rc) || fCompleted)
-            break;
-        ULONG cPercentNow;
-        rc = progress->COMGETTER(Percent)(&cPercentNow);
-        if (FAILED(rc))
-            break;
-        if ((cPercentNow / 10) != (cPercent / 10))
-        {
-            cPercent = cPercentNow;
-            RTPrintf("...%d%%", cPercentNow);
-            RTStrmFlush(g_pStdOut);
-        }
-
-        /* wait */
-        rc = progress->WaitForCompletion(100);
-    }
-
-    HRESULT lrc;
-    rc = progress->COMGETTER(ResultCode)(&lrc);
-    if (FAILED(rc))
-        lrc = ~0;
-    if (!lrc)
-    {
-        RTPrintf(" -- Saved the state successfully.\n");
-        RTThreadYield();
-    }
-    else
-        RTPrintf("-- Error saving state, lrc=%d (%#x)\n", lrc, lrc);
-
+    RT_NOREF(sig);
+    g_fTerminateFE = true;
 }
 #endif /* VBOX_WITH_SAVESTATE_ON_SIGNAL */
@@ -1454 +1405 @@
 
 #ifdef VBOX_WITH_SAVESTATE_ON_SIGNAL
-        signal(SIGINT, SaveState);
-        signal(SIGTERM, SaveState);
+        signal(SIGPIPE, SIG_IGN);
+        signal(SIGTTOU, SIG_IGN);
+
+        struct sigaction sa;
+        RT_ZERO(sa);
+        sa.sa_handler = HandleSignal;
+        sigaction(SIGHUP,  &sa, NULL);
+        sigaction(SIGINT,  &sa, NULL);
+        sigaction(SIGTERM, &sa, NULL);
+        sigaction(SIGUSR1, &sa, NULL);
+        sigaction(SIGUSR2, &sa, NULL);
 #endif
 
@@ -1523 +1483 @@
 
         ComPtr<IProgress> pProgress;
-        CHECK_ERROR_BREAK(gConsole, PowerDown(pProgress.asOutParam()));
+#ifdef VBOX_WITH_SAVESTATE_ON_SIGNAL
+        if (!machine.isNull())
+            CHECK_ERROR_BREAK(machine, SaveState(pProgress.asOutParam()));
+        else
+#endif
+            CHECK_ERROR_BREAK(gConsole, PowerDown(pProgress.asOutParam()));
 
         rc = showProgress(pProgress);