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

Timestamp:

Oct 20, 2010 10:01:48 AM (14 years ago)

Author:

vboxsync

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

66805

Message:

VBoxService/Guest Execution: Update.

Location:

trunk/src/VBox/Main

Files:

• GuestImpl.cpp (modified) (18 diffs)
• idl/VirtualBox.xidl (modified) (4 diffs)
• include/GuestImpl.h (modified) (1 diff)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -683 +683 @@
                 case PROC_STS_TEN: /* Terminated normally. */
                     LogRel(("Guest process (PID %u) exited normally\n", pCBData->u32PID)); /** @todo Add process name */
-                    hr = it->second.pProgress->notifyComplete(S_OK);
-                    AssertComRC(hr);
-                    LogFlowFunc(("Proccess (context ID=%u, status=%u) terminated successfully\n",
-                                 pData->hdr.u32ContextID, pData->u32Status));
+                    if (!it->second.pProgress->getCompleted())
+                    {
+                        hr = it->second.pProgress->notifyComplete(S_OK);
+                        AssertComRC(hr);
+
+                        LogFlowFunc(("Proccess (CID=%u, status=%u) terminated successfully\n",
+                                     pData->hdr.u32ContextID, pData->u32Status));
+                    }
                     break;
 
@@ -724 +728 @@
                     if (pData->u32Flags & ExecuteProcessFlag_IgnoreOrphanedProcesses)
                     {
-                        hr = it->second.pProgress->notifyComplete(S_OK);
-                        AssertComRC(hr);
+                        if (!it->second.pProgress->getCompleted())
+                        {
+                            hr = it->second.pProgress->notifyComplete(S_OK);
+                            AssertComRC(hr);
+                        }
                     }
                     else
@@ -809 +816 @@
                                                                    "%s", errMsg.c_str());
                 AssertComRC(hr2);
-                LogFlowFunc(("Process (context ID=%u, status=%u) reported error: %s\n",
+                LogFlowFunc(("Process (CID=%u, status=%u) reported error: %s\n",
                              pData->hdr.u32ContextID, pData->u32Status, errMsg.c_str()));
             }
@@ -815 +822 @@
     }
     else
-        LogFlowFunc(("Unexpected callback (magic=%u, context ID=%u) arrived\n", pData->hdr.u32Magic, pData->hdr.u32ContextID));
+        LogFlowFunc(("Unexpected callback (magic=%u, CID=%u) arrived\n", pData->hdr.u32Magic, pData->hdr.u32ContextID));
     LogFlowFunc(("Returned with rc=%Rrc\n", vrc));
     return vrc;
@@ -867 +874 @@
         }
         else
-            it->second.pProgress->notifyComplete(S_OK);
+        {
+            BOOL fCompleted;
+            if (   SUCCEEDED(it->second.pProgress->COMGETTER(Completed)(&fCompleted))
+                && !fCompleted)
+            {
+                    /* If we previously got completed notification, don't trigger again. */
+                it->second.pProgress->notifyComplete(S_OK);
+            }
+        }
     }
     else
-        LogFlowFunc(("Unexpected callback (magic=%u, context ID=%u) arrived\n", pData->hdr.u32Magic, pData->hdr.u32ContextID));
+        LogFlowFunc(("Unexpected callback (magic=%u, CID=%u) arrived\n", pData->hdr.u32Magic, pData->hdr.u32ContextID));
     return rc;
 }
@@ -889 +904 @@
         AssertPtr(pCBData);
 
-        /* Nothing to do here yet. */
+        /* Save bytes processed. */
+        pCBData->cbProcessed = pData->cbProcessed;
 
         /* Was progress canceled before? */
@@ -902 +918 @@
         }
         else
-            it->second.pProgress->notifyComplete(S_OK);
+        {
+            BOOL fCompleted;
+            if (   SUCCEEDED(it->second.pProgress->COMGETTER(Completed)(&fCompleted))
+                && !fCompleted)
+            {
+                    /* If we previously got completed notification, don't trigger again. */
+                it->second.pProgress->notifyComplete(S_OK);
+            }
+        }
     }
     else
-        LogFlowFunc(("Unexpected callback (magic=%u, context ID=%u) arrived\n", pData->hdr.u32Magic, pData->hdr.u32ContextID));
+        LogFlowFunc(("Unexpected callback (magic=%u, CID=%u) arrived\n", pData->hdr.u32Magic, pData->hdr.u32ContextID));
     return rc;
 }
@@ -918 +942 @@
     if (it != mCallbackMap.end())
     {
-        LogFlowFunc(("Client with context ID=%u disconnected\n", it->first));
+        LogFlowFunc(("Client with CID=%u disconnected\n", it->first));
         destroyCtrlCallbackContext(it);
     }
@@ -1362 +1386 @@
 }
 
-STDMETHODIMP Guest::SetProcessInput(ULONG aPID, ULONG aFlags, ULONG aTimeoutMS, ComSafeArrayIn(BYTE, aData), ULONG *aBytesWritten)
+STDMETHODIMP Guest::SetProcessInput(ULONG aPID, ULONG aFlags, ComSafeArrayIn(BYTE, aData), ULONG *aBytesWritten)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -1370 +1394 @@
 
     CheckComArgExpr(aPID, aPID > 0);
-    if (aFlags != 0) /* Flags are not supported at the moment. */
-        return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), aFlags);
+    CheckComArgOutPointerValid(aBytesWritten);
+
+    /* Validate flags. */
+    if (aFlags)
+    {
+        if (!(aFlags & ProcessInputFlag_EOF))
+            return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), aFlags);
+    }
 
     AutoCaller autoCaller(this);
@@ -1380 +1410 @@
     try
     {
+        /* Init. */
+        *aBytesWritten = 0;
+
         /* Search for existing PID. */
         GuestProcessMapIterConst itProc = getProcessByPID(aPID);
@@ -1409 +1442 @@
             {
                 rc = progress->init(static_cast<IGuest*>(this),
-                                    Bstr(tr("Getting output of process")).raw(),
-                                    TRUE);
+                                    Bstr(tr("Setting input for process")).raw(),
+                                    TRUE /* Cancelable */);
             }
             if (FAILED(rc)) return rc;
-
-            /* Adjust timeout */
-            if (aTimeoutMS == 0)
-                aTimeoutMS = UINT32_MAX;
 
             PCALLBACKDATAEXECINSTATUS pData = (PCALLBACKDATAEXECINSTATUS)RTMemAlloc(sizeof(CALLBACKDATAEXECINSTATUS));
@@ -1430 +1459 @@
 
             com::SafeArray<BYTE> sfaData(ComSafeArrayInArg(aData));
+            uint32_t cbSize = sfaData.size();
 
             VBOXHGCMSVCPARM paParms[6];
@@ -1436 +1466 @@
             paParms[i++].setUInt32(aPID);
             paParms[i++].setUInt32(aFlags);
-            paParms[i++].setPointer(sfaData.raw(), sfaData.size());
-            paParms[i++].setUInt32(sfaData.size());
+            paParms[i++].setPointer(sfaData.raw(), cbSize);
+            paParms[i++].setUInt32(cbSize);
 
             int vrc = VINF_SUCCESS;
@@ -1464 +1494 @@
             if (RT_SUCCESS(vrc))
             {
-                LogFlowFunc(("Waiting for HGCM callback (timeout=%ldms) ...\n", aTimeoutMS));
+                LogFlowFunc(("Waiting for HGCM callback ...\n"));
 
                 /*
@@ -1478 +1508 @@
 
                     /* Wait until operation completed. */
-                    rc = it->second.pProgress->WaitForCompletion(aTimeoutMS);
+                    rc = it->second.pProgress->WaitForCompletion(UINT32_MAX /* Wait forever */);
                     if (FAILED(rc)) throw rc;
 
@@ -1491 +1521 @@
                             && fCompleted)
                         {
-                            /* Nothing to do here yet. */
+                            PCALLBACKDATAEXECINSTATUS pData = (PCALLBACKDATAEXECINSTATUS)it->second.pvData;
+                            Assert(it->second.cbData == sizeof(CALLBACKDATAEXECINSTATUS));
+                            AssertPtr(pData);
+
+                            *aBytesWritten = pData->cbProcessed;
                         }
-                        else /* If callback not called within time ... well, that's a timeout! */
-                            vrc = VERR_TIMEOUT;
                     }
                     else /* Operation was canceled. */
-                    {
                         vrc = VERR_CANCELLED;
-                    }
 
                     if (RT_FAILURE(vrc))
                     {
-                        if (vrc == VERR_TIMEOUT)
-                        {
-                            rc = setError(VBOX_E_IPRT_ERROR,
-                                          tr("The guest did not process input within time (%ums)"), aTimeoutMS);
-                        }
-                        else if (vrc == VERR_CANCELLED)
+                        if (vrc == VERR_CANCELLED)
                         {
                             rc = setError(VBOX_E_IPRT_ERROR,
@@ -1929 +1954 @@
             && !(aFlags & CopyFileFlag_Update)
             && !(aFlags & CopyFileFlag_FollowLinks))
-            return E_INVALIDARG;
+        {
+            return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), aFlags);
+        }
     }
 

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

@@ -7603 +7603 @@
 
   <enum
+    name="ProcessInputFlag"
+    uuid="5d38c1dd-2604-4ddf-92e5-0c0cdd3bdbd5"
+  >
+    <desc>
+      Guest process input flags.
+    </desc>
+
+    <const name="None"     value="0">
+      <desc>No flag set.</desc>
+    </const>
+    <const name="EOF"   value="1">
+        <desc>End of file (input) reached.</desc>
+    </const>
+  </enum>
+
+  <enum
     name="CopyFileFlag"
     uuid="23f79fdf-738a-493d-b80b-42d607c9b916"
@@ -7614 +7630 @@
     </const>
 
-    <const name="Recursive"   value="2">
+    <const name="Recursive"   value="1">
       <desc>Copy directories recursively.</desc>
     </const>
 
-    <const name="Update"      value="4">
+    <const name="Update"      value="2">
       <desc>Copy only when the source file is newer than the destination file or when the destination file is missing.</desc>
     </const>
 
-    <const name="FollowLinks" value="8">
+    <const name="FollowLinks" value="4">
       <desc>Follow symbolic links.</desc>
     </const>
@@ -7629 +7645 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="c165a809-0882-4c76-9220-746da84b5ecf"
+     uuid="5d38c1dd-2604-4ddf-92e5-0c0cdd3bdbd5"
      wsmap="managed"
      >
@@ -7964 +7980 @@
         <desc>
           Not used, must be set to zero.
-        </desc>
-      </param>
-      <param name="timeoutMS" type="unsigned long" dir="in">
-        <desc>
-          The maximum timeout value (in msec) to wait for handling
-          the input data. Pass 0 for an infinite timeout.
         </desc>
       </param>

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

@@ -99 +99 @@
                               ULONG aTimeoutMS, ULONG *aPID, IProgress **aProgress);
     STDMETHOD(GetProcessOutput)(ULONG aPID, ULONG aFlags, ULONG aTimeoutMS, LONG64 aSize, ComSafeArrayOut(BYTE, aData));
-    STDMETHOD(SetProcessInput)(ULONG aPID, ULONG aFlags, ULONG aTimeoutMS, ComSafeArrayIn(BYTE, aData), ULONG *aBytesWritten);
+    STDMETHOD(SetProcessInput)(ULONG aPID, ULONG aFlags, ComSafeArrayIn(BYTE, aData), ULONG *aBytesWritten);
     STDMETHOD(GetProcessStatus)(ULONG aPID, ULONG *aExitCode, ULONG *aFlags, ULONG *aStatus);
     STDMETHOD(CopyToGuest)(IN_BSTR aSource, IN_BSTR aDest, ULONG aFlags, IProgress **aProgress);