Changeset 89907 in vbox

Timestamp:

Jun 24, 2021 11:23:21 PM (4 years ago)

Author:

vboxsync

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

145365

Message:

FE/VBoxHeadless: Enable signal handlers on all unix platforms. Note
in the function's comment for showProgress() that we don't check for
signals in b/c the power up/down operations are not cancelable anyway.
Establish the signal handlers earlier. Add a todo item to convert any
temporary changes we do to the settings to use RAII so that they are
undone automatically. bugref:8161.

File:

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

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

@@ -58 +58 @@
 #endif
 
-//#define VBOX_WITH_SAVESTATE_ON_SIGNAL
-#ifdef VBOX_WITH_SAVESTATE_ON_SIGNAL
+#if !defined(RT_OS_WINDOWS)
 #include <signal.h>
 static void HandleSignal(int sig);
@@ -396 +395 @@
 VBOX_LISTENER_DECLARE(ConsoleEventListenerImpl)
 
-#ifdef VBOX_WITH_SAVESTATE_ON_SIGNAL
+#if !defined(RT_OS_WINDOWS)
 static void
 HandleSignal(int sig)
@@ -404 +403 @@
     g_fTerminateFE = true;
 }
-#endif /* VBOX_WITH_SAVESTATE_ON_SIGNAL */
+#endif /* !RT_OS_WINDOWS */
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -983 +982 @@
 /*
  * Simplified version of showProgress() borrowed from VBoxManage.
+ * Note that machine power up/down operations are not cancelable, so
+ * we don't bother checking for signals.
  */
 HRESULT
@@ -1623 +1624 @@
         Log(("VBoxHeadless: Powering up the machine...\n"));
 
-        ComPtr <IProgress> progress;
-        if (!fPaused)
-            CHECK_ERROR_BREAK(console, PowerUp(progress.asOutParam()));
-        else
-            CHECK_ERROR_BREAK(console, PowerUpPaused(progress.asOutParam()));
-
-        rc = showProgress(progress);
-        if (FAILED(rc))
-        {
-            com::ProgressErrorInfo info(progress);
-            if (info.isBasicAvailable())
-            {
-                RTPrintf("Error: failed to start machine. Error message: %ls\n", info.getText().raw());
-            }
-            else
-            {
-                RTPrintf("Error: failed to start machine. No error message available!\n");
-            }
-            break;
-        }
-
-#ifdef VBOX_WITH_SAVESTATE_ON_SIGNAL
+
+        /**
+         * @todo We should probably install handlers earlier so that
+         * we can undo any temporary settings we do above in case of
+         * an early signal and use RAII to ensure proper cleanup.
+         */
+#if !defined(RT_OS_WINDOWS)
         signal(SIGPIPE, SIG_IGN);
         signal(SIGTTOU, SIG_IGN);
@@ -1656 +1642 @@
         sigaction(SIGUSR1, &sa, NULL);
         sigaction(SIGUSR2, &sa, NULL);
-#endif
-
-#ifdef RT_OS_WINDOWS
+#else /* RT_OS_WINDOWS */
         /*
          * Register windows console signal handler to react to Ctrl-C,
-         * Ctrl-Break, Close.
+         * Ctrl-Break, Close, non-interactive session termination.
          */
         ::SetConsoleCtrlHandler(ConsoleCtrlHandler, TRUE);
-
+#endif
+
+
+        ComPtr <IProgress> progress;
+        if (!fPaused)
+            CHECK_ERROR_BREAK(console, PowerUp(progress.asOutParam()));
+        else
+            CHECK_ERROR_BREAK(console, PowerUpPaused(progress.asOutParam()));
+
+        rc = showProgress(progress);
+        if (FAILED(rc))
+        {
+            com::ProgressErrorInfo info(progress);
+            if (info.isBasicAvailable())
+            {
+                RTPrintf("Error: failed to start machine. Error message: %ls\n", info.getText().raw());
+            }
+            else
+            {
+                RTPrintf("Error: failed to start machine. No error message available!\n");
+            }
+            break;
+        }
+
+#ifdef RT_OS_WINDOWS
         /*
          * Spawn windows message pump to monitor session events.