Changeset 28463 in vbox

Timestamp:

Apr 19, 2010 2:04:12 PM (15 years ago)

Author:

vboxsync

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

60250

Message:

Guest Control: Update (extended error info, callback bugfixes).

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (2 diffs)
• Main/GuestImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp

@@ -363 +363 @@
             if (cMsElapsed >= cMillies)
             {
+                VBoxServiceVerbose(3, "Control: Process timed out (%ums elapsed > %ums timeout), killing ...", cMsElapsed, cMillies);
+
                 fProcessTimedOut = true;
                 if (    MsProcessKilled == UINT64_MAX

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

@@ -284 +284 @@
                 /* Wait for process to exit ... */
                 ASSERT(progress);
-                rc = progress->WaitForCompletion(uTimeoutMS == 0 ? -1 /* Wait forever */ : uTimeoutMS);
+                rc = progress->WaitForCompletion(uTimeoutMS == 0 ? -1 /* Wait forever */ : (uTimeoutMS + 5000));
                 if (FAILED(rc))
                 {
@@ -300 +300 @@
                     LONG iRc;
                     CHECK_ERROR_RET(progress, COMGETTER(ResultCode)(&iRc), rc);
-
-                    if (verbose)
-                        RTPrintf("Process completed.\n");
+                    if (FAILED(iRc))
+                    {
+                        ComPtr<IVirtualBoxErrorInfo> execError;
+                        rc = progress->COMGETTER(ErrorInfo)(execError.asOutParam());
+                        com::ErrorInfo info (execError);
+                        GluePrintErrorInfo(info);
+                    }
+                    else
+                    {   
+                        if (verbose)
+                            RTPrintf("Process completed.\n");
+                    }
 
                     /* Print output if wanted. */

trunk/src/VBox/Main/GuestImpl.cpp

@@ -492 +492 @@
                           PHOSTEXECCALLBACKDATA pData)
 {
+    LogFlowFuncEnter();
     int rc = VINF_SUCCESS;
 
@@ -507 +508 @@
 
         /* Do progress handling. */
+        Utf8Str errMsg;
+        HRESULT rc2 = S_OK;
         switch (pData->u32Status)
         {
+            case PROC_STS_STARTED:
+                break;
+
             case PROC_STS_TEN: /* Terminated normally. */
+                it->pProgress->notifyComplete(S_OK);
+                break;
+
             case PROC_STS_TEA: /* Terminated abnormally. */
+                errMsg = Utf8StrFmt(Guest::tr("Process terminated abnormally with status '%u'"),
+                                    pCBData->u32Flags);
+                break;
+
             case PROC_STS_TES: /* Terminated through signal. */
+                errMsg = Utf8StrFmt(Guest::tr("Process terminated via signal with status '%u'"),
+                                    pCBData->u32Flags);
+                break;
+
             case PROC_STS_TOK:
+                errMsg = Utf8StrFmt(Guest::tr("Process timed out and was killed"));
+                break;
+
             case PROC_STS_TOA:
+                errMsg = Utf8StrFmt(Guest::tr("Process timed out and could not be killed"));
+                break;
+
             case PROC_STS_DWN:
-
-                if (!it->pProgress.isNull())
-                    it->pProgress->notifyComplete(S_OK);
+                errMsg = Utf8StrFmt(Guest::tr("Process exited because system is shutting down"));
                 break;
 
@@ -524 +545 @@
         }
 
+        if (   !it->pProgress.isNull()
+            && errMsg.length())
+        {
+            it->pProgress->notifyComplete(E_FAIL /** @todo Find a better rc! */, COM_IIDOF(IGuest),
+                                          (CBSTR)Guest::getComponentName(), errMsg.c_str());
+        }
         ASMAtomicWriteBool(&it->bCalled, true);
     }
+    LogFlowFuncLeave();
     return rc;
 }
@@ -542 +570 @@
 void Guest::removeCtrlCallbackContext(Guest::CallbackListIter it)
 {
+    LogFlowFuncEnter();
     if (it->cbData)
     {
@@ -556 +585 @@
     }
     mCallbackList.erase(it);
-}
-
+    LogFlowFuncLeave();
+}
+
+/* Adds a callback with a user provided data block and an optional progress object
+ * to the callback list. A callback is identified by a unique context ID which is used
+ * to identify a callback from the guest side. */
 uint32_t Guest::addCtrlCallbackContext(void *pvData, uint32_t cbData, Progress* pProgress)
 {
+    LogFlowFuncEnter();
+
     uint32_t uNewContext = ASMAtomicIncU32(&mNextContextID);
     /** @todo Add value clamping! */
@@ -574 +609 @@
         removeCtrlCallbackContext(mCallbackList.begin());
 
+    LogFlowFuncLeave();
     return uNewContext;
 }
@@ -608 +644 @@
          */
         ComObjPtr <Progress> progress;
-        HRESULT rc = progress.createObject();
+        rc = progress.createObject();
         if (SUCCEEDED(rc))
         {