Changeset 36887 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 29, 2011 10:04:52 AM (14 years ago)

Author:

vboxsync

Message:

GuestCtrl: Added support for getting separated stdout/stderr output.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControlExec.cpp (modified) (4 diffs)
• VBoxServiceControlExecThread.cpp (modified) (2 diffs)

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

@@ -191 +191 @@
 
 /**
- * Handle pending output data or error on standard out, standard error or the
- * test pipe.
- *
- * @returns IPRT status code from client send.
- * @param   pThread             The thread specific data.
+ * Handle pending output data/error on standard out or standard error.
+ *
+ * @return  IPRT status code.
  * @param   hPollSet            The polling set.
  * @param   fPollEvt            The event mask returned by RTPollNoResume.
- * @param   phPipeR             The pipe handle.
- * @param   pu32Crc             The current CRC-32 of the stream. (In/Out)
- * @param   uHandleId           The handle ID.
- *
- * @todo    Put the last 4 parameters into a struct!
+ * @param   phPipeR             The pipe to be read from.
+ * @param   uHandleId           Handle ID of the pipe to be read from.
+ * @param   pBuf                Pointer to pipe buffer to store the read data into.
  */
 static int VBoxServiceControlExecProcHandleOutputEvent(RTPOLLSET hPollSet, uint32_t fPollEvt, PRTPIPE phPipeR,
-                                                       uint32_t uHandleId, PVBOXSERVICECTRLEXECPIPEBUF pStdOutBuf)
-{
+                                                       uint32_t uHandleId, PVBOXSERVICECTRLEXECPIPEBUF pBuf)
+{
+    AssertPtrReturn(phPipeR, VERR_INVALID_POINTER);
+    AssertPtrReturn(pBuf, VERR_INVALID_POINTER);
+
 #ifdef DEBUG
-    VBoxServiceVerbose(4, "ControlExec: HandleOutputEvent: fPollEvt=%#x\n", fPollEvt);
+    VBoxServiceVerbose(4, "ControlExec: HandleOutputEvent: fPollEvt=%#x, uHandle=%u\n",
+                       fPollEvt, uHandleId);
 #endif
 
@@ -222 +222 @@
     {
         uint32_t cbWritten;
-        rc = VBoxServicePipeBufWriteToBuf(pStdOutBuf, abBuf,
+        rc = VBoxServicePipeBufWriteToBuf(pBuf, abBuf,
                                           cbRead, false /* Pending close */, &cbWritten);
         if (RT_SUCCESS(rc))
@@ -376 +376 @@
                 case VBOXSERVICECTRLPIPEID_STDERR:
                     rc = VBoxServiceControlExecProcHandleOutputEvent(hPollSet, fPollEvt, phStdErrR,
-                                                                     VBOXSERVICECTRLPIPEID_STDERR, &pData->stdOut);
+                                                                     VBOXSERVICECTRLPIPEID_STDERR, &pData->stdErr);
                     break;
 
@@ -1348 +1348 @@
                  *       on the host never will get completed! */
                 /* cbRead now contains actual size. */
-                rc = VbglR3GuestCtrlExecSendOut(u32ClientId, uContextID, uPID, uHandleID, 0 /* Flags */,
+                rc = VbglR3GuestCtrlExecSendOut(u32ClientId, uContextID, uPID, uHandleID, uFlags,
                                                 pBuf, cbRead);
             }

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

@@ -27 +27 @@
 #include <iprt/semaphore.h>
 #include <iprt/string.h>
+
+#include <VBox/HostServices/GuestControlSvc.h>
 
 #include "VBoxServicePipeBuf.h"
@@ -285 +287 @@
             switch (uHandleId)
             {
-                case 2: /* StdErr */
+                case OUTPUT_HANDLE_ID_STDERR: /* StdErr */
                     pPipeBuf = &pData->stdErr;
                     break;
 
-                case 0: /* StdOut */
+                case OUTPUT_HANDLE_ID_STDOUT: /* StdOut */
                 default:
                     pPipeBuf = &pData->stdOut;