Changeset 28354 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 15, 2010 12:34:53 PM (15 years ago)

Author:

vboxsync

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

60114

Message:

Guest Control: Update (lProgress handling, wait for exiting process).

Location:

trunk/src/VBox/Main

Files:

• GuestImpl.cpp (modified) (8 diffs)
• idl/VirtualBox.xidl (modified) (3 diffs)
• include/GuestImpl.h (modified) (4 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -506 +506 @@
         /* @todo Copy void* buffer contents! */
 
+        /* Do progress handling. */
+        switch (pData->u32Status)
+        {
+            case PROC_STS_TEN: /* Terminated normally. */
+            case PROC_STS_TEA: /* Terminated abnormally. */
+            case PROC_STS_TES: /* Terminated through signal. */
+
+                if (!it->pProgress.isNull())
+                    it->pProgress->notifyComplete(S_OK);
+                break;
+
+            default:
+                break;
+        }
+
         ASMAtomicWriteBool(&it->bCalled, true);
     }
@@ -529 +544 @@
         it->cbData = 0;
         it->pvData = NULL;
+
+        /* Notify outstanding waits for progress ... */
+        if (!it->pProgress.isNull())
+        {
+            it->pProgress->notifyComplete(S_OK);
+            it->pProgress = NULL;
+        }
     }
     mCallbackList.erase(it);
 }
 
-uint32_t Guest::addCtrlCallbackContext(void *pvData, uint32_t cbData)
+uint32_t Guest::addCtrlCallbackContext(void *pvData, uint32_t cbData, Progress* pProgress)
 {
     uint32_t uNewContext = ASMAtomicIncU32(&mNextContextID);
@@ -543 +565 @@
     context.pvData = pvData;
     context.cbData = cbData;
+    context.pProgress = pProgress;
 
     mCallbackList.push_back(context);
@@ -581 +604 @@
          * Create progress object.
          */
-#if 0
         ComObjPtr <Progress> progress;
-        progress.createObject();
-        HRESULT rc = progress->init(/** @todo How to get the machine here? */
-                                    static_cast<IGuest*>(this),
-                                    BstrFmt(tr("Executing process")),
-                                    FALSE);
+        HRESULT rc = progress.createObject();
+        if (SUCCEEDED(rc))
+        {
+            rc = progress->init(static_cast<IGuest*>(this),
+                                //static_cast<IConsole *>(this),
+                                BstrFmt(tr("Executing process")),
+                                FALSE);
+        }
         if (FAILED(rc)) return rc;
-#endif
+
         /*
          * Prepare process execution.
@@ -647 +672 @@
                     PHOSTEXECCALLBACKDATA pData = (HOSTEXECCALLBACKDATA*)RTMemAlloc(sizeof(HOSTEXECCALLBACKDATA));
                     AssertPtr(pData);
-                    uContextID = addCtrlCallbackContext(pData, sizeof(HOSTEXECCALLBACKDATA));
+                    uContextID = addCtrlCallbackContext(pData, sizeof(HOSTEXECCALLBACKDATA), progress);
                     Assert(uContextID > 0);
 
@@ -729 +754 @@
                 else /* If callback not called within time ... well, that's a timeout! */
                     vrc = VERR_TIMEOUT;
-                removeCtrlCallbackContext(it);
-
+                
+                /*
+                 * Do *not* remove the callback yet - we might wait with the IProgress object on something
+                 * else (like end of process) ... 
+                 */
                 if (RT_FAILURE(vrc))
                 {
@@ -759 +787 @@
                     }
                 }
-#if 0
-                progress.queryInterfaceTo(aProgress);
-#endif
+                else
+                {
+                    /* Return the progress to the caller. */
+                    progress.queryInterfaceTo(aProgress);
+                }
             }
             else
@@ -783 +813 @@
 }
 
+STDMETHODIMP Guest::GetProcessOutput(BSTR *aBuffer, ULONG aFlags)
+{
+#ifndef VBOX_WITH_GUEST_CONTROL
+    ReturnComNotImplemented();
+#else  /* VBOX_WITH_GUEST_CONTROL */
+    using namespace guestControl;
+
+    CheckComArgOutPointerValid(aBuffer);
+#endif
+}
+
 // public methods only for internal purposes
 /////////////////////////////////////////////////////////////////////////////

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

@@ -8372 +8372 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="8cf03bf9-7478-42de-add8-10b2af75a06d"
+     uuid="105f4e9a-b8d5-49e5-9397-032e78155bee"
      wsmap="managed"
      >
@@ -8515 +8515 @@
         Executes an existing program inside the guest VM.
 
-        <result name="E_NOTIMPL">
-          Not implemented yet.
+        <result name="VBOX_E_IPRT_ERROR">
+          Could not execute process.
         </result>
 
@@ -8587 +8587 @@
         <desc>Progress object to track the operation completion.</desc>
       </param>
+    </method>
+
+    <method name="getProcessOutput">
+      <desc>
+        Retrieves output of a formerly started process.
+
+                <result name="VBOX_E_IPRT_ERROR">
+          Could not retrieve output.
+        </result>
+
+      </desc>
+      <param name="buffer" type="wstring" dir="out">
+        <desc>
+          Buffer for retrieving the actual output.
+        </desc>
+      </param>      
+      <param name="flags" type="unsigned long" dir="in">
+        <desc>
+                  Flags describing which output to retrieve.
+        </desc>
+      </param>      
     </method>
 

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

@@ -47 +47 @@
 
 class Console;
+#ifdef VBOX_WITH_GUEST_CONTROL
+class Progress;
+#endif
 
 class ATL_NO_VTABLE Guest :
@@ -94 +97 @@
                               IN_BSTR aUserName, IN_BSTR aPassword,
                               ULONG aTimeoutMS, ULONG* aPID, IProgress **aProgress);
+    STDMETHOD(GetProcessOutput)(BSTR *aBuffer, ULONG aFlags);
     STDMETHOD(InternalGetStatistics)(ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
                                      ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemCache,
@@ -125 +129 @@
         /** Atomic flag whether callback was called. */
         volatile bool   bCalled;
+        ComObjPtr<Progress>      pProgress;
     };
     typedef std::list< CallbackContext > CallbackList;
@@ -136 +141 @@
     CallbackListIter getCtrlCallbackContext(uint32_t u32ContextID);
     void removeCtrlCallbackContext(CallbackListIter it);
-    uint32_t addCtrlCallbackContext(void *pvData, uint32_t cbData);
+    uint32_t addCtrlCallbackContext(void *pvData, uint32_t cbData, Progress* pProgress);
 # endif