Changeset 24915 in vbox for trunk

Timestamp:

Nov 24, 2009 3:09:43 PM (15 years ago)

Author:

vboxsync

Message:

VBoxManage: Implemented cancelation in showProgress for cancelable progress objects.

File:

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

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

@@ -42 +42 @@
 #include <VBox/version.h>
 
+#include <iprt/asm.h>
 #include <iprt/buildconfig.h>
-#include <iprt/env.h>
 #include <iprt/initterm.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>
 
+#include <signal.h>
+
 #include "VBoxManage.h"
 
@@ -54 +56 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-/*extern*/ bool g_fDetailedProgress = false;
-
+/*extern*/ bool         g_fDetailedProgress = false;
 
 #ifndef VBOX_ONLY_DOCS
+/** Set by the signal handler. */
+static volatile bool    g_fCanceled = false;
+
+
+/**
+ * Signal handler that sets g_fCanceled.
+ *
+ * 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
+ * unnecessary here.
+ */
+static void showProgressSignalHandler(int iSignal)
+{
+    NOREF(iSignal);
+    ASMAtomicWriteBool(&g_fCanceled, true);
+}
+
+
 /**
  * Print out progress on the console
@@ -84 +103 @@
     }
 
+    /* setup signal handling if cancelable */
+    bool fCanceledAlready = false;
+    BOOL fCancelable;
+    HRESULT hrc = progress->COMGETTER(Cancelable)(&fCancelable);
+    if (FAILED(hrc))
+        fCancelable = FALSE;
+    if (fCancelable)
+    {
+        signal(SIGINT,   showProgressSignalHandler);
+#ifdef SIGBREAK
+        signal(SIGBREAK, showProgressSignalHandler);
+#endif
+    }
+
     while (SUCCEEDED(progress->COMGETTER(Completed(&fCompleted))))
     {
@@ -101 +134 @@
             }
 
-            if (    (ulCurrentPercent != ulLastPercent)
-                 || (ulCurrentOperationPercent != ulLastOperationPercent)
+            if (    ulCurrentPercent != ulLastPercent
+                 || ulCurrentOperationPercent != ulLastOperationPercent
                )
             {
@@ -133 +166 @@
             break;
 
+        /* process async cancelation */
+        if (g_fCanceled && !fCanceledAlready)
+        {
+            hrc = progress->Cancel();
+            if (SUCCEEDED(hrc))
+                fCanceledAlready = true;
+            else
+                g_fCanceled = false;
+        }
+
         /* make sure the loop is not too tight */
         progress->WaitForCompletion(100);
+    }
+
+    /* undo signal handling */
+    if (fCancelable)
+    {
+        signal(SIGINT,   SIG_DFL);
+#ifdef SIGBREAK
+        signal(SIGBREAK, SIG_DFL);
+#endif
     }
 
@@ -143 +195 @@
         if (SUCCEEDED(iRc))
             RTPrintf("100%%\n");
+        else if (g_fCanceled)
+            RTPrintf("CANCELED\n");
         else
             RTPrintf("FAILED\n");
@@ -151 +205 @@
     return iRc;
 }
+
 #endif /* !VBOX_ONLY_DOCS */
-
 
 int main(int argc, char *argv[])