Changeset 32852 in vbox

Timestamp:

Sep 30, 2010 3:49:35 PM (14 years ago)

Author:

vboxsync

Message:

Guest Execution:

• Implemented "ignore orphaned childs" flag (--flags ignoreorphanedchilds); this flag will tell the host to not bitch about an executed process which still is alive when VBoxService (or the entire guest OS) shuts down.
• Fixed shutdown/notification hang when waiting for std output which never arrives.

Location:

trunk

Files:

• include/VBox/HostServices/GuestControlSvc.h (modified) (2 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (4 diffs)
• src/VBox/Main/GuestImpl.cpp (modified) (5 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (1 diff)

trunk/include/VBox/HostServices/GuestControlSvc.h

@@ -62 +62 @@
     /** Process timed out and was not killed successfully. */
     PROC_STS_TOA = 6,
-    /** Service is stopping, process was killed. */
+    /** Service/OS is stopping, process was killed. */
     PROC_STS_DWN = 7,
     /** Something went wrong (error code in flags). */
@@ -88 +88 @@
     /* The process status. */
     uint32_t u32Status;
-    /** Optional flags (not used atm). */
+    /** Optional flags, varies, based on u32Status. */
     uint32_t u32Flags;
     /** Optional data buffer (not used atm). */

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

@@ -258 +258 @@
 
     AssertPtr(pThread);
-
-    AssertPtr(pThread);
+    Assert(pThread->enmType == VBoxServiceCtrlThreadDataExec);
     PVBOXSERVICECTRLTHREADDATAEXEC pData = (PVBOXSERVICECTRLTHREADDATAEXEC)pThread->pvData;
     AssertPtr(pData);
@@ -457 +456 @@
             VBoxServiceVerbose(3, "ControlExec: Process got terminated because system/service is about to shutdown\n");
             uStatus = PROC_STS_DWN; /* Service is stopping, process was killed. */
+            uFlags = pData->uFlags; /* Return handed-in execution flags back to the host. */
         }
         else if (fProcessAlive)

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

@@ -195 +195 @@
         else if (!strcmp(a->argv[i], "--flags"))
         {
-            if (   i + 1 >= a->argc
-                || RTStrToUInt32Full(a->argv[i + 1], 10, &uFlags) != VINF_SUCCESS)
-                usageOK = false;
-            else
-                ++i;
+            if (i + 1 >= a->argc)
+                usageOK = false;
+            else
+            {
+                /** @todo Needs a bit better processing as soon as we have more flags. */
+                if (!strcmp(a->argv[i + 1], "ignoreorphanedchilds"))
+                    uFlags |= ExecuteProcessFlag_IgnoreOrphanedProcesses;
+                else
+                    usageOK = false;
+                ++i;
+            }
         }
         else if (   !strcmp(a->argv[i], "--username")
@@ -409 +415 @@
                             }
                             cbOutputData = 0;
+                            fCompleted = true; /* rc contains a failure, so we'll go into aborted state down below. */
                         }
                         else
@@ -489 +496 @@
                     if (FAILED(iRc))
                     {
-                        ComPtr<IVirtualBoxErrorInfo> execError;
-                        rc = progress->COMGETTER(ErrorInfo)(execError.asOutParam());
-                        com::ErrorInfo info(execError, COM_IIDOF(IVirtualBoxErrorInfo));
-                        if (SUCCEEDED(rc) && info.isFullAvailable())
+                        com::ProgressErrorInfo info(progress);
+                        if (   info.isFullAvailable()
+                            || info.isBasicAvailable())
                         {
                             /* If we got a VBOX_E_IPRT error we handle the error in a more gentle way
@@ -505 +511 @@
                         }
                         else
-                            AssertMsgFailed(("Full error description is missing!\n"));
+                        {
+                            if (RT_FAILURE(rc))
+                                RTMsgError("Error while looking up error code, rc=%Rrc", rc);
+                            else
+                                com::GluePrintRCMessage(iRc);
+                        }
                     }
                     else if (fVerbose)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -687 +687 @@
 
                 case PROC_STS_DWN:
-                    LogRel(("Guest process (PID %u) exited because system is shutting down\n", pCBData->u32PID)); /** @todo Add process name */
-                    errMsg = Utf8StrFmt(Guest::tr("Process exited because system is shutting down"));
+                    LogRel(("Guest process (PID %u) killed because system is shutting down\n", pCBData->u32PID)); /** @todo Add process name */
+                    /*
+                     * If u32Flags has ExecuteProcessFlag_IgnoreOrphanedProcesses set, we don't report an error to
+                     * our progress object. This is helpful for waiters which rely on the success of our progress object
+                     * even if the executed process was killed because the system/VBoxService is shutting down.
+                     *
+                     * In this case u32Flags contains the actual execution flags reached in via Guest::ExecuteProcess().
+                     */
+                    if (pData->u32Flags & ExecuteProcessFlag_IgnoreOrphanedProcesses)
+                    {
+                        hr = it->second.pProgress->notifyComplete(S_OK);
+                        AssertComRC(hr);
+                    }
+                    else
+                    {
+                        errMsg = Utf8StrFmt(Guest::tr("Process killed because system is shutting down"));
+                    }
                     break;
 
@@ -734 +749 @@
                 || fCanceled) /* If canceled we have to report E_FAIL! */
             {
+                /* Destroy all callbacks which are still waiting on something
+                 * which is related to the current PID. */
+                CallbackMapIter it2;
+                for (it2 = mCallbackMap.begin(); it2 != mCallbackMap.end(); it2++)
+                {
+                    switch(it2->second.mType)
+                    {
+                        case VBOXGUESTCTRLCALLBACKTYPE_EXEC_START:
+                            break;
+
+                        /* When waiting for process output while the process is destroyed,
+                         * make sure we also destroy the actual waiting operation (internal progress object)
+                         * in order to not block the caller. */
+                        case VBOXGUESTCTRLCALLBACKTYPE_EXEC_OUTPUT:
+                        {
+                            PCALLBACKDATAEXECOUT pItData = (CALLBACKDATAEXECOUT*)it2->second.pvData;
+                            AssertPtr(pItData);
+                            if (pItData->u32PID == pCBData->u32PID)
+                                destroyCtrlCallbackContext(it2);
+                            break;
+                        }
+                    }
+                }
+
                 HRESULT hr2 = it->second.pProgress->notifyComplete(VBOX_E_IPRT_ERROR,
                                                                    COM_IIDOF(IGuest),
@@ -967 +1006 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    if (aFlags != 0) /* Flags are not supported at the moment. */
-        return E_INVALIDARG;
+    /* Validate flags. */
+    if (aFlags)
+    {
+        if (!(aFlags & ExecuteProcessFlag_IgnoreOrphanedProcesses))
+            return E_INVALIDARG;
+    }
 
     HRESULT rc = S_OK;
@@ -1277 +1320 @@
         /*
          * Create progress object.
-         * This progress object, compared to the one in executeProgress() above,
+         * This progress object, compared to the one in executeProgress() above
          * is only local and is used to determine whether the operation finished
          * or got canceled.
@@ -1299 +1342 @@
         AssertReturn(pData, VBOX_E_IPRT_ERROR);
         RT_ZERO(*pData);
+        /* Save PID + output flags for later use. */
+        pData->u32PID = aPID;
+        pData->u32Flags = aFlags;
+        /* Add job to callback contexts. */
         uint32_t uContextID = addCtrlCallbackContext(VBOXGUESTCTRLCALLBACKTYPE_EXEC_OUTPUT,
                                                      pData, sizeof(CALLBACKDATAEXECOUT), progress);

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -7702 +7702 @@
   </enum>
 
+  <enum
+    name="ExecuteProcessFlag"
+    uuid="9a24c17d-bd46-4207-b247-517fdd6d6b8f"
+  >
+    <desc>
+      Guest process execution flags.
+    </desc>
+
+    <const name="None"                    value="0">
+      <desc>No flag set.</desc>
+    </const>
+
+    <const name="IgnoreOrphanedProcesses" value="2">
+      <desc>Do not report an error when executed processes are still alive when VBoxService or the guest OS is shutting down.</desc>
+    </const>
+  </enum>
+
   <interface
      name="IGuest" extends="$unknown"