Changeset 28803 in vbox for trunk

Timestamp:

Apr 27, 2010 9:53:43 AM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Update on error codes/handling in Main/VBoxManage.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (3 diffs)
• Main/GuestImpl.cpp (modified) (10 diffs)

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

@@ -342 +342 @@
                         || waitForStdErr)
                     {
-                        if (verbose) RTPrintf("Retrieving output data ...\n");
+                        bool bFound = false;
                         while (true)
                         {
@@ -352 +352 @@
                             if (cbOutputData == 0)
                                 break;
+
+                            if (!bFound && verbose) 
+                            {
+                                RTPrintf("Retrieving output data ...\n");
+                                bFound = true;
+                            }
 
                             /* aOutputData has a platform dependent line ending, standardize on
@@ -372 +378 @@
                             RTStrmWrite(g_pStdOut, aOutputData.raw(), cbOutputDataPrint);
                         }
+                        if (!bFound && verbose) 
+                            RTPrintf("No output data available\n");
                     }
                 }

trunk/src/VBox/Main/GuestImpl.cpp

@@ -568 +568 @@
     int rc = VINF_SUCCESS;
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
     AssertPtr(pData);
     CallbackListIter it = getCtrlCallbackContextByID(pData->hdr.u32ContextID);
@@ -578 +576 @@
         AssertPtr(pCBData);
 
+        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
         pCBData->u32PID = pData->u32PID;
         pCBData->u32HandleId = pData->u32HandleId;
@@ -586 +586 @@
         {
             pCBData->pvData = RTMemAlloc(pData->cbData);
-            AssertPtr(pCBData->pvData);
+            AssertReturn(pCBData->pvData, VERR_NO_MEMORY);
             memcpy(pCBData->pvData, pData->pvData, pData->cbData);
             pCBData->cbData = pData->cbData;
@@ -630 +630 @@
     LogFlowFuncEnter();
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    if (it->cbData)
+    if (it->pvData)
     {
         RTMemFree(it->pvData);
+        it->pvData = NULL;
         it->cbData = 0;
-        it->pvData = NULL;
 
         /* Notify outstanding waits for progress ... */
@@ -734 +734 @@
             uNumArgs = args.size();
             papszArgv = (char**)RTMemAlloc(sizeof(char*) * (uNumArgs + 1));
-            AssertPtr(papszArgv);
+            AssertReturn(papszArgv, VERR_NO_MEMORY);
             for (unsigned i = 0; RT_SUCCESS(vrc) && i < uNumArgs; i++)
                 vrc = RTStrAPrintf(&papszArgv[i], "%s", Utf8Str(args[i]).raw());
@@ -775 +775 @@
                 {
                     PHOSTEXECCALLBACKDATA pData = (HOSTEXECCALLBACKDATA*)RTMemAlloc(sizeof(HOSTEXECCALLBACKDATA));
-                    AssertPtr(pData);
+                    AssertReturn(pData, VBOX_E_IPRT_ERROR);
                     uContextID = addCtrlCallbackContext(VBOXGUESTCTRLCALLBACKTYPE_EXEC_START, 
                                                         pData, sizeof(HOSTEXECCALLBACKDATA), progress);
@@ -840 +840 @@
                             cMsWait = RT_MIN(1000, aTimeoutMS - (uint32_t)cMsElapsed);
                         }
-                        RTThreadSleep(100);
+                        RTThreadYield();
                     } while (!it->bCalled);
                 }
@@ -972 +972 @@
     HRESULT rc = S_OK;
 
-    /* Search for existing PID. */
-    PHOSTEXECOUTCALLBACKDATA pData = (HOSTEXECOUTCALLBACKDATA*)RTMemAlloc(sizeof(HOSTEXECOUTCALLBACKDATA));
-    uint32_t uContextID = addCtrlCallbackContext(VBOXGUESTCTRLCALLBACKTYPE_EXEC_OUTPUT,
-                                                 pData, sizeof(HOSTEXECOUTCALLBACKDATA), NULL /* pProgress */);
-    Assert(uContextID > 0);
-
-    size_t cbData = (size_t)RT_MIN(aSize, _64K);
-    com::SafeArray<BYTE> outputData(cbData);
-
-    VBOXHGCMSVCPARM paParms[5];
-    int i = 0;
-    paParms[i++].setUInt32(uContextID);
-    paParms[i++].setUInt32(aPID);
-    paParms[i++].setUInt32(aFlags); /** @todo Should represent stdout and/or stderr. */
-
-    int vrc = VINF_SUCCESS;
-
-    {
-        /* Make sure mParent is valid, so set the read lock while using. */
-        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-        /* Forward the information to the VMM device. */
-        AssertPtr(mParent);
-        VMMDev *vmmDev = mParent->getVMMDev();
-        if (vmmDev)
-        {
-            LogFlowFunc(("hgcmHostCall numParms=%d\n", i));
-            vrc = vmmDev->hgcmHostCall("VBoxGuestControlSvc", HOST_EXEC_GET_OUTPUT,
-                                       i, paParms);
-        }
-    }
-
-    if (RT_SUCCESS(vrc))
-    {
-        LogFlowFunc(("Waiting for HGCM callback (timeout=%ldms) ...\n", aTimeoutMS));
-
-        /*
-         * Wait for the HGCM low level callback until the process
-         * has been started (or something went wrong). This is necessary to
-         * get the PID.
-         */
-        CallbackListIter it = getCtrlCallbackContextByID(uContextID);
-        if (it != mCallbackList.end())
-        {
-            uint64_t u64Started = RTTimeMilliTS();
-            do
+    try
+    {
+        /* Search for existing PID. */
+        PHOSTEXECOUTCALLBACKDATA pData = (HOSTEXECOUTCALLBACKDATA*)RTMemAlloc(sizeof(HOSTEXECOUTCALLBACKDATA));
+        AssertReturn(pData, VBOX_E_IPRT_ERROR);
+        uint32_t uContextID = addCtrlCallbackContext(VBOXGUESTCTRLCALLBACKTYPE_EXEC_OUTPUT,
+                                                     pData, sizeof(HOSTEXECOUTCALLBACKDATA), NULL /* pProgress */);
+        Assert(uContextID > 0);
+    
+        size_t cbData = (size_t)RT_MIN(aSize, _64K);
+        com::SafeArray<BYTE> outputData(cbData);
+    
+        VBOXHGCMSVCPARM paParms[5];
+        int i = 0;
+        paParms[i++].setUInt32(uContextID);
+        paParms[i++].setUInt32(aPID);
+        paParms[i++].setUInt32(aFlags); /** @todo Should represent stdout and/or stderr. */
+    
+        int vrc = VINF_SUCCESS;
+    
+        {
+            /* Make sure mParent is valid, so set the read lock while using. */
+            AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    
+            /* Forward the information to the VMM device. */
+            AssertPtr(mParent);
+            VMMDev *vmmDev = mParent->getVMMDev();
+            if (vmmDev)
             {
-                unsigned cMsWait;
-                if (aTimeoutMS == RT_INDEFINITE_WAIT)
-                    cMsWait = 1000;
+                LogFlowFunc(("hgcmHostCall numParms=%d\n", i));
+                vrc = vmmDev->hgcmHostCall("VBoxGuestControlSvc", HOST_EXEC_GET_OUTPUT,
+                                           i, paParms);
+            }
+        }
+    
+        if (RT_SUCCESS(vrc))
+        {
+            LogFlowFunc(("Waiting for HGCM callback (timeout=%ldms) ...\n", aTimeoutMS));
+    
+            /*
+             * Wait for the HGCM low level callback until the process
+             * has been started (or something went wrong). This is necessary to
+             * get the PID.
+             */
+            CallbackListIter it = getCtrlCallbackContextByID(uContextID);
+            if (it != mCallbackList.end())
+            {
+                uint64_t u64Started = RTTimeMilliTS();
+                do
+                {
+                    unsigned cMsWait;
+                    if (aTimeoutMS == RT_INDEFINITE_WAIT)
+                        cMsWait = 1000;
+                    else
+                    {
+                        uint64_t cMsElapsed = RTTimeMilliTS() - u64Started;
+                        if (cMsElapsed >= aTimeoutMS)
+                            break; /* timed out */
+                        cMsWait = RT_MIN(1000, aTimeoutMS - (uint32_t)cMsElapsed);
+                    }
+                    RTThreadYield();
+                } while (!it->bCalled);
+    
+                AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    
+                /* Did we get some output? */
+                pData = (HOSTEXECOUTCALLBACKDATA*)it->pvData;
+                Assert(it->cbData == sizeof(HOSTEXECOUTCALLBACKDATA));
+                AssertPtr(pData);
+    
+                if (   it->bCalled
+                    && pData->cbData
+                    && pData->pvData)
+                {
+                    /* Do we need to resize the array? */
+                    if (pData->cbData > cbData)
+                        outputData.resize(pData->cbData);
+    
+                    /* Fill output in supplied out buffer. */
+                    memcpy(outputData.raw(), pData->pvData, pData->cbData);
+                    outputData.resize(pData->cbData); /* Shrink to fit actual buffer size. */
+                }
                 else
-                {
-                    uint64_t cMsElapsed = RTTimeMilliTS() - u64Started;
-                    if (cMsElapsed >= aTimeoutMS)
-                        break; /* timed out */
-                    cMsWait = RT_MIN(1000, aTimeoutMS - (uint32_t)cMsElapsed);
-                }
-                RTThreadSleep(100);
-            } while (!it->bCalled);
-
-            AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-            /* Did we get some output? */
-            pData = (HOSTEXECOUTCALLBACKDATA*)it->pvData;
-            Assert(it->cbData == sizeof(HOSTEXECOUTCALLBACKDATA));
-            AssertPtr(pData);
-
-            if (   it->bCalled
-                && pData->cbData)
-            {
-                /* Do we need to resize the array? */
-                if (pData->cbData > cbData)
-                    outputData.resize(pData->cbData);
-
-                /* Fill output in supplied out buffer. */
-                memcpy(outputData.raw(), pData->pvData, pData->cbData);
-                outputData.resize(pData->cbData); /* Shrink to fit actual buffer size. */
+                    vrc = VERR_NO_DATA; /* This is not an error we want to report to COM. */
             }
             else
-                vrc = VERR_NO_DATA; /* This is not an error we want to report to COM. */
-        }
-
+                rc = setError(VBOX_E_IPRT_ERROR,
+                              tr("Process (PID %u) not found!"), aPID);    
+        }
+        else
+            rc = setError(E_UNEXPECTED,
+                          tr("The HGCM call failed with error %Rrc"), vrc);
+    
         /* If something failed (or there simply was no data, indicated by VERR_NO_DATA,
          * we return an empty array so that the frontend knows when to give up. */
@@ -1060 +1071 @@
         outputData.detachTo(ComSafeArrayOutArg(aData));
     }
+    catch (std::bad_alloc &)
+    {
+        rc = E_OUTOFMEMORY;
+    }
     return rc;
 #endif
@@ -1073 +1088 @@
     HRESULT rc = S_OK;
 
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    GuestProcessIterConst it;
-    for (it = mGuestProcessList.begin(); it != mGuestProcessList.end(); it++)
-    {
-        if (it->mPID == aPID)
-            break;
-    }
-
-    if (it != mGuestProcessList.end())
-    {
-        *aExitCode = it->mExitCode;
-        *aFlags = it->mFlags;
-        *aStatus = it->mStatus;
-    }
-    else
-        rc = setError(VBOX_E_IPRT_ERROR,
-                      tr("Process (PID %u) not found!"), aPID);
+    try
+    {
+        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    
+        GuestProcessIterConst it;
+        for (it = mGuestProcessList.begin(); it != mGuestProcessList.end(); it++)
+        {
+            if (it->mPID == aPID)
+                break;
+        }
+    
+        if (it != mGuestProcessList.end())
+        {
+            *aExitCode = it->mExitCode;
+            *aFlags = it->mFlags;
+            *aStatus = it->mStatus;
+        }
+        else
+            rc = setError(VBOX_E_IPRT_ERROR,
+                          tr("Process (PID %u) not found!"), aPID);
+    }
+    catch (std::bad_alloc &)
+    {
+        rc = E_OUTOFMEMORY;
+    }
     return rc;
 #endif