Changeset 39487 in vbox

Timestamp:

Dec 1, 2011 10:58:19 AM (13 years ago)

Author:

vboxsync

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

75146

Message:

GuestCtrl: More bugfixing.

Location:

trunk/src/VBox/Main

Files:

• include/GuestImpl.h (modified) (1 diff)
• src-client/GuestCtrlImpl.cpp (modified) (3 diffs)
• src-client/GuestCtrlImplTasks.cpp (modified) (5 diffs)

trunk/src/VBox/Main/include/GuestImpl.h

@@ -179 +179 @@
     int     executeStreamGetNextBlock(ULONG ulPID, ULONG ulFlags, GuestProcessStream &stream, GuestProcessStreamBlock &streamBlock);
     int     executeStreamParseNextBlock(ULONG ulPID, ULONG ulFlags, GuestProcessStream &stream, GuestProcessStreamBlock &streamBlock);
-    HRESULT executeStreamParse(ULONG ulPID, ULONG ulFlags, GuestCtrlStreamObjects &streamObjects);
-    HRESULT executeWaitForStatusChange(ULONG uPID, ULONG uTimeoutMS, ExecuteProcessStatus_T *pRetStatus, ULONG *puRetExitCode);
+    HRESULT executeStreamParse(ULONG uPID, ULONG ulFlags, GuestCtrlStreamObjects &streamObjects);
+    HRESULT executeWaitForExit(ULONG uPID, ComPtr<IProgress> pProgress, ULONG uTimeoutMS,
+                               ExecuteProcessStatus_T *pRetStatus, ULONG *puRetExitCode);
     // Internal guest file functions
     HRESULT fileExistsInternal(IN_BSTR aFile, IN_BSTR aUsername, IN_BSTR aPassword, BOOL *aExists);

trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp

@@ -1506 +1506 @@
 
 /**
- * Does busy waiting on a formerly started guest process.
+ * Waits for a fomerly started guest process to exit using its progress
+ * object and returns its final status. Returns E_ABORT if guest process
+ * was canceled.
  *
- * @return  HRESULT
+ * @return  IPRT status code.
  * @param   uPID                    PID of guest process to wait for.
- * @param   uTimeoutMS              Waiting timeout (in ms). Specify 0 for an infinite timeout.
- * @param   pRetStatus              Pointer which receives current process status after the change.
- *                                  Optional.
- * @param   puRetExitCode           Pointer which receives the final exit code in case of guest process
- *                                  termination. Optional.
+ * @param   pProgress               Progress object to wait for.
+ * @param   uTimeoutMS              Timeout (in ms) for waiting; use 0 for
+ *                                  an indefinite timeout.
+ * @param   pRetStatus              Pointer where to store the final process
+ *                                  status. Optional.
+ * @param   puRetExitCode           Pointer where to store the final process
+ *                                  exit code. Optional.
  */
-HRESULT Guest::executeWaitForStatusChange(ULONG uPID, ULONG uTimeoutMS,
-                                          ExecuteProcessStatus_T *pRetStatus, ULONG *puRetExitCode)
-{
-    ULONG uExitCode, uRetFlags;
-    ExecuteProcessStatus_T curStatus;
-    HRESULT hRC = GetProcessStatus(uPID, &uExitCode, &uRetFlags, &curStatus);
-    if (FAILED(hRC))
-        return hRC;
-
-    /* We only want to wait for started processes. All other statuses
-     * won't be found anyway anymore (see processGetStatus() to know why). */
-    if (curStatus == ExecuteProcessStatus_Started)
-    {
-        uint64_t u64StartMS = RTTimeMilliTS();
-        if (uTimeoutMS == 0)
-            uTimeoutMS = UINT32_MAX;
-
-        do
-        {
-            if (   uTimeoutMS != UINT32_MAX
-                && RTTimeMilliTS() - u64StartMS > uTimeoutMS)
-            {
-                hRC = setError(VBOX_E_IPRT_ERROR,
-                               tr("The process (PID %u) did not change its status within time (%ums)"),
-                               uPID, uTimeoutMS);
-                break;
-            }
-            hRC = GetProcessStatus(uPID, &uExitCode, &uRetFlags, &curStatus);
-            if (FAILED(hRC))
-                break;
-            RTThreadSleep(100);
-        } while(*pRetStatus == curStatus);
-    }
-
-    if (SUCCEEDED(hRC))
-    {
+HRESULT Guest::executeWaitForExit(ULONG uPID, ComPtr<IProgress> pProgress, ULONG uTimeoutMS,
+                                  ExecuteProcessStatus_T *pRetStatus, ULONG *puRetExitCode)
+{
+    HRESULT rc = S_OK;
+
+    BOOL fCanceled = FALSE;
+    if (   SUCCEEDED(pProgress->COMGETTER(Canceled(&fCanceled)))
+        && fCanceled)
+    {
+        return E_ABORT;
+    }
+
+    BOOL fCompleted = FALSE;
+    if (   SUCCEEDED(pProgress->COMGETTER(Completed(&fCompleted)))
+        && !fCompleted)
+    {
+        rc = pProgress->WaitForCompletion(  !uTimeoutMS
+                                          ? -1 /* No timeout */
+                                          : uTimeoutMS);
+        if (FAILED(rc))
+            rc = setError(VBOX_E_IPRT_ERROR,
+                          tr("Waiting for guest process to end failed (%Rhrc)"),
+                          rc);
+    }
+
+    if (SUCCEEDED(rc))
+    {
+        ULONG uExitCode, uRetFlags;
+        ExecuteProcessStatus_T enmStatus;
+        HRESULT hRC = GetProcessStatus(uPID, &uExitCode, &uRetFlags, &enmStatus);
+        if (FAILED(hRC))
+            return hRC;
+
         if (pRetStatus)
-            *pRetStatus = curStatus;
+            *pRetStatus = enmStatus;
         if (puRetExitCode)
             *puRetExitCode = uExitCode;
-    }
-    return hRC;
+        /** @todo Flags? */
+    }
+
+    return rc;
 }
 
@@ -2209 +2212 @@
     ReturnComNotImplemented();
 #else  /* VBOX_WITH_GUEST_CONTROL */
-    CheckComArgNotNull(aExitCode);
-    CheckComArgNotNull(aFlags);
-    CheckComArgNotNull(aStatus);
 
     AutoCaller autoCaller(this);
@@ -2224 +2224 @@
         if (RT_SUCCESS(vrc))
         {
-            *aExitCode = process.mExitCode;
-            *aFlags = process.mFlags;
-            *aStatus = process.mStatus;
+            if (aExitCode)
+                *aExitCode = process.mExitCode;
+            if (aFlags)
+                *aFlags = process.mFlags;
+            if (aStatus)
+                *aStatus = process.mStatus;
         }
         else

trunk/src/VBox/Main/src-client/GuestCtrlImplTasks.cpp

@@ -70 +70 @@
 
     LogFlowFuncEnter();
-    LogFlowFunc(("Guest %p\n", pGuest));
 
     HRESULT rc = S_OK;
@@ -295 +294 @@
                             }
                             else
+                            {
                                 rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->pProgress,
                                                                      Guest::tr("Seeking file \"%s\" failed; offset = %RU64 (%Rrc)"),
                                                                      aTask->strSource.c_str(), cbTransferedTotal, vrc);
+                                break;
+                            }
                             /* Resize buffer to reflect amount we just have read.
                              * Size 0 is allowed! */
@@ -360 +362 @@
                             ExecuteProcessStatus_T retStatus;
                             ULONG uRetExitCode;
-                            rc = pGuest->executeWaitForStatusChange(uPID, 0 /* No timeout. */,
-                                                                    &retStatus, &uRetExitCode);
+
+                            rc = executeWaitForExit(uPID, execProgress, 0 /* No timeout */,
+                                                    &retStatus, &uRetExitCode);
                             if (FAILED(rc))
                             {
@@ -372 +375 @@
                                 {
                                     rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->pProgress,
-                                                                         Guest::tr("Guest reported error %u while copying file \"%s\" to \"%s\""),
-                                                                         uRetExitCode, aTask->strSource.c_str(), aTask->strDest.c_str());
+                                                                         Guest::tr("Guest process reported error %u (status: %u) while copying file \"%s\" to \"%s\""),
+                                                                         uRetExitCode, retStatus, aTask->strSource.c_str(), aTask->strDest.c_str());
                                 }
                             }
@@ -592 +595 @@
                     RTFileClose(hFileDest);
 
-                    if (   cbTransfered
-                        && (cbTransfered != lFileSize))
-                    {
-                        /*
-                         * Only bitch about an unexpected end of a file when there already
-                         * was data read from that file. If this was the very first read we can
-                         * be (almost) sure that this file is not meant to be read by the specified user.
-                         */
-                        rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->pProgress,
-                                                             Guest::tr("Unexpected end of file \"%s\" (%u bytes total, %u bytes transferred)"),
-                                                             aTask->strSource.c_str(), lFileSize, cbTransfered);
-                    }
-
                     if (SUCCEEDED(rc))
-                        aTask->pProgress->notifyComplete(S_OK);
+                    {
+                        if (   cbTransfered
+                            && (cbTransfered != lFileSize))
+                        {
+                            /*
+                             * Only bitch about an unexpected end of a file when there already
+                             * was data read from that file. If this was the very first read we can
+                             * be (almost) sure that this file is not meant to be read by the specified user.
+                             */
+                            rc = GuestTask::setProgressErrorInfo(VBOX_E_IPRT_ERROR, aTask->pProgress,
+                                                                 Guest::tr("Unexpected end of file \"%s\" (%u bytes total, %u bytes transferred)"),
+                                                                 aTask->strSource.c_str(), lFileSize, cbTransfered);
+                        }
+
+                        if (SUCCEEDED(rc))
+                            aTask->pProgress->notifyComplete(S_OK);
+                    }
                 }
             }