儲存庫 vbox 的更動 18396

時間撮記:

2009-3-27 下午02:06:29 (16 年 以前)

作者:

vboxsync

訊息:

VBoxManage: add hidden --detailed-progress option for import to debug progress display.

位置:

trunk/src/VBox/Frontends/VBoxManage

檔案:

• VBoxManage.cpp (修改) (1 筆差異)
• VBoxManage.h (修改) (2 筆差異)
• VBoxManageHelp.cpp (修改) (1 筆差異)
• VBoxManageImport.cpp (修改) (1 筆差異)

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

@@ -67 +67 @@
 #endif /* !VBOX_ONLY_DOCS */
 
-// funcs
-///////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+//
+// global variables
+//
+////////////////////////////////////////////////////////////////////////////////
+
+/*extern*/ bool g_fDetailedProgress = false;
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// functions
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef VBOX_ONLY_DOCS
+/**
+ * Print out progress on the console
+ */
+void showProgress(ComPtr<IProgress> progress)
+{
+    BOOL fCompleted;
+    ULONG ulCurrentPercent;
+    ULONG ulLastPercent = 0;
+
+    ULONG ulCurrentOperationPercent;
+    ULONG ulLastOperationPercent;
+
+    ULONG ulLastOperation = (ULONG)-1;
+    Bstr bstrOperationDescription;
+
+    ULONG cOperations;
+    progress->COMGETTER(OperationCount)(&cOperations);
+
+    if (!g_fDetailedProgress)
+    {
+        RTPrintf("0%%...");
+        RTStrmFlush(g_pStdOut);
+    }
+
+    while (SUCCEEDED(progress->COMGETTER(Completed(&fCompleted))))
+    {
+        ULONG ulOperation;
+        progress->COMGETTER(Operation)(&ulOperation);
+
+        progress->COMGETTER(Percent(&ulCurrentPercent));
+        progress->COMGETTER(OperationPercent(&ulCurrentOperationPercent));
+
+        if (g_fDetailedProgress)
+        {
+            if (ulLastOperation != ulOperation)
+            {
+                progress->COMGETTER(OperationDescription(bstrOperationDescription.asOutParam()));
+                ulLastPercent = (ULONG)-1;        // force print
+                ulLastOperation = ulOperation;
+            }
+
+            if (    (ulCurrentPercent != ulLastPercent)
+                 || (ulCurrentOperationPercent != ulLastOperationPercent)
+               )
+            {
+                RTPrintf("(%ld/%ld) %ls %ld%% => %ld%%\n", ulOperation + 1, cOperations, bstrOperationDescription.raw(), ulCurrentOperationPercent, ulCurrentPercent);
+                ulLastPercent = ulCurrentPercent;
+                ulLastOperationPercent = ulCurrentOperationPercent;
+            }
+        }
+        else
+        {
+            /* did we cross a 10% mark? */
+            if (((ulCurrentPercent / 10) > (ulLastPercent / 10)))
+            {
+                /* make sure to also print out missed steps */
+                for (ULONG curVal = (ulLastPercent / 10) * 10 + 10; curVal <= (ulCurrentPercent / 10) * 10; curVal += 10)
+                {
+                    if (curVal < 100)
+                    {
+                        RTPrintf("%ld%%...", curVal);
+                        RTStrmFlush(g_pStdOut);
+                    }
+                }
+                ulLastPercent = (ulCurrentPercent / 10) * 10;
+            }
+        }
+        if (fCompleted)
+            break;
+
+        /* make sure the loop is not too tight */
+        progress->WaitForCompletion(100);
+    }
+
+    /* complete the line. */
+    HRESULT rc;
+    if (SUCCEEDED(progress->COMGETTER(ResultCode)(&rc)))
+    {
+        if (SUCCEEDED(rc))
+            RTPrintf("100%%\n");
+        else
+            RTPrintf("FAILED\n");
+    }
+    else
+        RTPrintf("\n");
+    RTStrmFlush(g_pStdOut);
+}
+#endif /* !VBOX_ONLY_DOCS */
 
 void showLogo(void)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -36 +36 @@
 # define USE_XPCOM_QUEUE
 #endif
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// definitions
+//
+////////////////////////////////////////////////////////////////////////////////
 
 /** @name Syntax diagram category.
@@ -124 +130 @@
 } VMINFO_DETAILS;
 
-/*
- * Prototypes
- */
+////////////////////////////////////////////////////////////////////////////////
+//
+// global variables
+//
+////////////////////////////////////////////////////////////////////////////////
+
+extern bool g_fDetailedProgress;        // in VBoxManage.cpp
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// prototypes
+//
+////////////////////////////////////////////////////////////////////////////////
 
 /* VBoxManageHelp.cpp */

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

@@ -554 +554 @@
 }
 
-#ifndef VBOX_ONLY_DOCS
-/**
- * Print out progress on the console
- */
-void showProgress(ComPtr<IProgress> progress)
-{
-    BOOL fCompleted;
-    ULONG currentPercent;
-    ULONG lastPercent = 0;
-
-    RTPrintf("0%%...");
-    RTStrmFlush(g_pStdOut);
-    while (SUCCEEDED(progress->COMGETTER(Completed(&fCompleted))))
-    {
-        progress->COMGETTER(Percent(&currentPercent));
-
-        /* did we cross a 10% mark? */
-        if (((currentPercent / 10) > (lastPercent / 10)))
-        {
-            /* make sure to also print out missed steps */
-            for (ULONG curVal = (lastPercent / 10) * 10 + 10; curVal <= (currentPercent / 10) * 10; curVal += 10)
-            {
-                if (curVal < 100)
-                {
-                    RTPrintf("%ld%%...", curVal);
-                    RTStrmFlush(g_pStdOut);
-                }
-            }
-            lastPercent = (currentPercent / 10) * 10;
-        }
-        if (fCompleted)
-            break;
-
-        /* make sure the loop is not too tight */
-        progress->WaitForCompletion(100);
-    }
-
-    /* complete the line. */
-    HRESULT rc;
-    if (SUCCEEDED(progress->COMGETTER(ResultCode)(&rc)))
-    {
-        if (SUCCEEDED(rc))
-            RTPrintf("100%%\n");
-        else
-            RTPrintf("FAILED\n");
-    }
-    else
-        RTPrintf("\n");
-    RTStrmFlush(g_pStdOut);
-}
-
-#endif /* !VBOX_ONLY_DOCS */

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

@@ -104 +104 @@
            )
             fExecute = false;
+        else if (strThisArg == "--detailed-progress")
+            g_fDetailedProgress = true;
         else if (strThisArg == "-vsys")
         {