Changeset 34831 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Dec 8, 2010 1:37:55 PM (14 years ago)

Author:

vboxsync

Message:

GuestControl/Copy: Use a thread (guest task) for displaying real progress and fixes for proper cancellation. Raised send buffers to _1M.

File:

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

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

@@ -201 +201 @@
 static int ctrlPrintProgressError(ComPtr<IProgress> progress)
 {
-    com::ProgressErrorInfo ErrInfo(progress);
-    return ctrlPrintError(ErrInfo);
+    int rc;
+    BOOL fCanceled;
+    if (   SUCCEEDED(progress->COMGETTER(Canceled(&fCanceled)))
+        && fCanceled)
+    {
+        rc = VERR_CANCELLED;
+    }
+    else
+    {
+        com::ProgressErrorInfo ErrInfo(progress);
+        rc = ctrlPrintError(ErrInfo);
+    }
+    return rc;
 }
 
@@ -954 +965 @@
  * @return  IPRT status code.
  * @param   pGuest          IGuest interface pointer.
+ * @param   fVerbose        Verbose flag.
  * @param   pszSource       Source path of existing host file to copy.
  * @param   pszDest         Destination path on guest to copy the file to.
@@ -960 +972 @@
  * @param   uFlags          Copy flags.
  */
-static int ctrlCopyFileToGuest(IGuest *pGuest, const char *pszSource, const char *pszDest,
+static int ctrlCopyFileToGuest(IGuest *pGuest, bool fVerbose, const char *pszSource, const char *pszDest,
                                const char *pszUserName, const char *pszPassword,
                                uint32_t uFlags)
@@ -978 +990 @@
     else
     {
-        /* Setup signal handling if cancelable. */
-        ASSERT(progress);
-        bool fCanceledAlready = false;
-        BOOL fCancelable = FALSE;
-        HRESULT hrc = progress->COMGETTER(Cancelable)(&fCancelable);
-        if (fCancelable)
-            ctrlSignalHandlerInstall();
-
-        /* Wait for process to exit ... */
-        BOOL fCompleted = FALSE;
-        BOOL fCanceled = FALSE;
-        while (   SUCCEEDED(progress->COMGETTER(Completed(&fCompleted)))
-               && !fCompleted)
-        {
-            /* Process async cancelation */
-            if (g_fGuestCtrlCanceled && !fCanceledAlready)
-            {
-                hrc = progress->Cancel();
-                if (SUCCEEDED(hrc))
-                    fCanceledAlready = TRUE;
-                else
-                    g_fGuestCtrlCanceled = false;
-            }
-
-            /* Progress canceled by Main API? */
-            if (   SUCCEEDED(progress->COMGETTER(Canceled(&fCanceled)))
-                && fCanceled)
-            {
-                break;
-            }
-        }
-
-        /* Undo signal handling. */
-        if (fCancelable)
-            ctrlSignalHandlerUninstall();
-
-        if (fCanceled)
-        {
-            /* Nothing to do here right now. */
-        }
-        else if (   fCompleted
-                 && SUCCEEDED(rc))
-        {
-            LONG iRc;
-            CHECK_ERROR_RET(progress, COMGETTER(ResultCode)(&iRc), rc);
-            if (FAILED(iRc))
-                vrc = ctrlPrintProgressError(progress);
-        }
+        rc = showProgress(progress);
+        if (FAILED(rc))
+            vrc = ctrlPrintProgressError(progress);
     }
     return vrc;
@@ -1208 +1175 @@
                         /* Finally copy the desired file (if no dry run selected). */
                         if (!fDryRun)
-                            vrc = ctrlCopyFileToGuest(guest, pNode->pszSourcePath, pNode->pszDestPath,
+                            vrc = ctrlCopyFileToGuest(guest, fVerbose, pNode->pszSourcePath, pNode->pszDestPath,
                                                       Utf8UserName.c_str(), Utf8Password.c_str(), uFlags);
                     }