Changeset 95201 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Jun 5, 2022 8:29:53 PM (3 years ago)

Author:

vboxsync

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

151709

Message:

VBoxHeadless: Reworked the signal handling for macOS to make it work right, given that processEventQueue won't return VERR_INTERRUPTED after a Ctrl-C was delivered. [build fix, adjustments] bugref:9898

File:

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

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

@@ -44 +44 @@
 #include <iprt/env.h>
 #include <iprt/errcore.h>
+#include <iprt/thread.h>
 #include <VBoxVideo.h>
 
@@ -79 +80 @@
 static IConsole *gConsole = NULL;
 static NativeEventQueue *gEventQ = NULL;
+/** Inidcates whether gEventQ can safely be used or not. */
+static volatile bool g_fEventQueueSafe = false;
 
 /* keep this handy for messages */
@@ -84 +87 @@
 static com::Utf8Str g_strVMUUID;
 
-/* flag whether frontend should terminate */
+/** flag whether frontend should terminate */
 static volatile bool g_fTerminateFE = false;
 
@@ -412 +415 @@
     if (pszThread)
     {
-        aSegs[cSegs++].iov_base = (char *)" on thread ";
+        aSegs[cSegs++].iov_base = (char *)"(on thread ";
         aSegs[cSegs++].iov_base = (char *)pszThread;        
-    }
-    aSegs[cSegs++].iov_base = (char *)"\n";
+        aSegs[cSegs++].iov_base = (char *)")\n";
+    }
+    else
+        aSegs[cSegs++].iov_base = (char *)"\n";
     for (int i = 0; i < cSegs; i++)
         aSegs[i].iov_len = strlen((const char *)aSegs[i].iov_base);
@@ -485 +490 @@
         if (sigwait(&SigSetWait, &iSignal) == 0)
         {
+            LogRel(("VBoxHeadless: Caught signal: %s\n", strsignal(iSignal)));
+            RTMsgInfo("");
+            RTMsgInfo("Caught signal: %s", strsignal(iSignal));
             g_fTerminateFE = true;
-            RTMsgInfo("Caught signal: %s\n", strsignal(iSignal));
-            LogRel(("VBoxHeadless: Caught signal: %s\n", strsignal(iSignal)));
         }
 
         /** @todo this is a little bit racy...   */
-        if (g_fTerminateFE && gEventQ != NULL)
+        if (g_fTerminateFE && g_fEventQueueSafe && gEventQ != NULL)
             gEventQ->interruptEventQueueProcessing();
     }
@@ -769 +775 @@
             /* tell the VM to save state/power off */
             g_fTerminateFE = true;
-            gEventQ->interruptEventQueueProcessing();
+            if (g_fEventQueueSafe && gEventQ != NULL)
+                gEventQ->interruptEventQueueProcessing();
 
             if (g_hCanQuit != NIL_RTSEMEVENT)
@@ -795 +802 @@
 
 
-static const char * const ctrl_event_names[] = {
+static const char * const g_apszCtrlEventNames[] =
+{
     "CTRL_C_EVENT",
     "CTRL_BREAK_EVENT",
@@ -811 +819 @@
 ConsoleCtrlHandler(DWORD dwCtrlType) RT_NOTHROW_DEF
 {
-    const char *signame;
-    char namebuf[48];
-    int rc;
-
-    if (dwCtrlType < RT_ELEMENTS(ctrl_event_names))
-        signame = ctrl_event_names[dwCtrlType];
+    const char *pszSigName;
+    char szNameBuf[48];
+    if (dwCtrlType < RT_ELEMENTS(g_apszCtrlEventNames))
+        pszSigName = g_apszCtrlEventNames[dwCtrlType];
     else
     {
         /* should not happen, but be prepared */
-        RTStrPrintf(namebuf, sizeof(namebuf),
-                    "<console control event %lu>", (unsigned long)dwCtrlType);
-        signame = namebuf;
-    }
-    LogRel(("VBoxHeadless: got %s\n", signame));
-    RTMsgInfo("Got %s\n", signame);
+        RTStrPrintf(szNameBuf, sizeof(szNameBuf), "<console control event %u>", dwCtrlType);
+        pszSigName = szNameBuf;
+    }
+
+    LogRel(("VBoxHeadless: got %s\n", pszSigName));
+    RTMsgInfo("Got %s", pszSigName);
     RTMsgInfo("");
 
     /* tell the VM to save state/power off */
     g_fTerminateFE = true;
-    gEventQ->interruptEventQueueProcessing();
+    if (g_fEventQueueSafe && gEventQ != NULL)
+        gEventQ->interruptEventQueueProcessing();
 
     /*
@@ -840 +847 @@
         LogRel(("VBoxHeadless: waiting for VM termination...\n"));
 
-        rc = RTSemEventWait(g_hCanQuit, RT_INDEFINITE_WAIT);
+        int rc = RTSemEventWait(g_hCanQuit, RT_INDEFINITE_WAIT);
         if (RT_FAILURE(rc))
             LogRel(("VBoxHeadless: Failed to wait for VM termination: %Rrc\n", rc));
@@ -1298 +1305 @@
         gConsole = console;
         gEventQ = com::NativeEventQueue::getMainEventQueue();
+        g_fEventQueueSafe = true;
 
         /* VirtualBoxClient events registration. */
@@ -1587 +1595 @@
     } while (0);
 
+    /* No point in trying to post dummy messages to the event queue now. */
+    g_fEventQueueSafe = false;
+
     /* VirtualBox callback unregistration. */
     if (vboxListener)