Changeset 44883 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Mar 1, 2013 10:44:14 AM (12 years ago)

Author:

vboxsync

Message:

FE/VBoxManage/GuestCtrl: Added proper timeout handling for reading guest process data.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (4 diffs)

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

@@ -508 +508 @@
  * @param   pProcess        Pointer to appropriate process object.
  * @param   pStrmOutput     Where to write the data.
- * @param   hStream         Where to read the data from.
+ * @param   uHandle         Handle where to read the data from.
+ * @param   uTimeoutMS      Timeout (in ms) to wait for the operation to complete.
  */
 static int ctrlExecPrintOutput(IProcess *pProcess, PRTSTREAM pStrmOutput,
-                               ULONG uHandle)
+                               ULONG uHandle, ULONG uTimeoutMS)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
@@ -519 +520 @@
 
     SafeArray<BYTE> aOutputData;
-    HRESULT rc = pProcess->Read(uHandle, _64K, 30 * 1000 /* 30s timeout. */,
+    HRESULT rc = pProcess->Read(uHandle, _64K, uTimeoutMS,
                                 ComSafeArrayAsOutParam(aOutputData));
     if (FAILED(rc))
@@ -854 +855 @@
         if (fReadStdOut) /* Do we need to fetch stdout data? */
         {
-            vrc = ctrlExecPrintOutput(pProcess, g_pStdOut, 1 /* StdOut */);
+            cMsTimeLeft = ctrlExecGetRemainingTime(u64StartMS, cMsTimeout);
+            vrc = ctrlExecPrintOutput(pProcess, g_pStdOut,
+                                      1 /* StdOut */, cMsTimeLeft);
             fReadStdOut = false;
         }
@@ -860 +863 @@
         if (fReadStdErr) /* Do we need to fetch stdout data? */
         {
-            vrc = ctrlExecPrintOutput(pProcess, g_pStdErr, 2 /* StdErr */);
+            cMsTimeLeft = ctrlExecGetRemainingTime(u64StartMS, cMsTimeout);
+            vrc = ctrlExecPrintOutput(pProcess, g_pStdErr,
+                                      2 /* StdErr */, cMsTimeLeft);
             fReadStdErr = false;
         }