Changeset 92861 in vbox for trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

Timestamp:

Dec 10, 2021 1:25:55 PM (3 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxManage: Fixed signal handling regression within the watch sub command, caused by r138248.

File:

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

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

@@ -375 +375 @@
         case CTRL_C_EVENT:
             ASMAtomicWriteBool(&g_fGuestCtrlCanceled, true);
+            RTSemEventSignal(g_SemEventGuestCtrlCanceled);
             fEventHandled = TRUE;
             break;
@@ -394 +395 @@
 static void gctlSignalHandler(int iSignal) RT_NOTHROW_DEF
 {
-    NOREF(iSignal);
+    RT_NOREF(iSignal);
     ASMAtomicWriteBool(&g_fGuestCtrlCanceled, true);
+    RTSemEventSignal(g_SemEventGuestCtrlCanceled);
 }
 #endif
@@ -3679 +3681 @@
 
     /** @todo Specify categories to watch for. */
-    /** @todo Specify a --timeout for waiting only for a certain amount of time? */
 
     RTEXITCODE rcExit = gctlCtxPostOptionParsingInit(pCtx);
@@ -3794 +3795 @@
         { "closesession",       gctlHandleCloseSession,     HELP_SCOPE_GSTCTRL_CLOSESESSION, GCTLCMDCTX_F_SESSION_ANONYMOUS | GCTLCMDCTX_F_NO_SIGNAL_HANDLER },
         { "list",               gctlHandleList,             HELP_SCOPE_GSTCTRL_LIST,         GCTLCMDCTX_F_SESSION_ANONYMOUS | GCTLCMDCTX_F_NO_SIGNAL_HANDLER },
-        { "watch",              gctlHandleWatch,            HELP_SCOPE_GSTCTRL_WATCH,        GCTLCMDCTX_F_SESSION_ANONYMOUS | GCTLCMDCTX_F_NO_SIGNAL_HANDLER },
+        { "watch",              gctlHandleWatch,            HELP_SCOPE_GSTCTRL_WATCH,        GCTLCMDCTX_F_SESSION_ANONYMOUS },
 
         {"updateguestadditions",gctlHandleUpdateAdditions,  HELP_SCOPE_GSTCTRL_UPDATEGA,     GCTLCMDCTX_F_SESSION_ANONYMOUS },