Changeset 33159 in vbox

Timestamp:

Oct 15, 2010 12:33:13 PM (14 years ago)

Author:

vboxsync

Message:

VBoxService/Guest Execution: Update.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (15 diffs)

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

@@ -105 +105 @@
     {
         size_t cbToWrite = pStdInBuf->cbSize - pStdInBuf->cbProcessed;
-        int rc = VINF_SUCCESS;
+#ifdef DEBUG
+        VBoxServiceVerbose(4, "ControlExec: Write StdIn: cbToWrite=%u, cbSize=%u, cbProc=%u\n",
+                               cbToWrite, pStdInBuf->cbSize, pStdInBuf->cbProcessed);
+#endif
         if (cbToWrite && pStdInBuf->fAlive)
         {
             rc = RTPipeWrite(hStdInW, &pStdInBuf->pbData[pStdInBuf->cbProcessed], cbToWrite, pcbWritten);
-            if (RT_SUCCESS(rc))
+            if (   RT_SUCCESS(rc)
+                && rc != VINF_TRY_AGAIN)
             {
                 Assert(*pcbWritten <= cbToWrite);
@@ -115 +119 @@
             }
             else
+            {
                 *pcbWritten = 0;
-        }
-        else
-            rc = VERR_BAD_PIPE;
+                pStdInBuf->fAlive = false;
+            }
+#ifdef DEBUG
+            VBoxServiceVerbose(4, "ControlExec: Written StdIn: rc=%Rrc, cbAlloc=%u, cbSize=%u, cbProc=%u, pcbWritten=%u\n",
+                               rc, pStdInBuf->cbAllocated, pStdInBuf->cbSize,
+                               pStdInBuf->cbProcessed, *pcbWritten);
+#endif
+        }
+        /*else
+            rc = VERR_BAD_PIPE;*/
         int rc2 = RTCritSectLeave(&pStdInBuf->CritSect);
         if (RT_SUCCESS(rc))
@@ -136 +148 @@
  * @param   phStdInW            The standard input pipe.
  * @param   pStdInBuf           The standard input buffer.
+ * @param   pcbWritten
  */
 static int  VBoxServiceControlExecProcHandleStdInWritableEvent(RTPOLLSET hPollSet, uint32_t fPollEvt, PRTPIPE phStdInW,
-                                                               PVBOXSERVICECTRLEXECPIPEBUF pStdInBuf)
-{
+                                                               PVBOXSERVICECTRLEXECPIPEBUF pStdInBuf, size_t *pcbWritten)
+{
+    AssertPtrReturn(pcbWritten, VERR_INVALID_PARAMETER);
+#ifdef DEBUG
     VBoxServiceVerbose(4, "ControlExec: HandleStdInWritableEvent: fPollEvt=%#x\n", fPollEvt);
-
+#endif
     int rc = VINF_SUCCESS;
     if (!(fPollEvt & RTPOLL_EVT_ERROR))
     {
-        size_t cbWritten;
-        rc = VBoxServiceControlExecProcWriteStdIn(pStdInBuf, *phStdInW, &cbWritten);
+        rc = VBoxServiceControlExecProcWriteStdIn(pStdInBuf, *phStdInW, pcbWritten);
         if (   RT_FAILURE(rc)
             && rc != VERR_BAD_PIPE)
@@ -153 +167 @@
             AssertRC(rc);
         }
-
-        /* No more data to write to stdin? Then remove stdin from poll set. */
-        if (   cbWritten <= 0
-            || rc == VERR_BAD_PIPE)
-        {
+        else if (/*   *pcbWritten <= 0
+                 ||*/  rc == VERR_BAD_PIPE)
+        {
+            /* No (more) data to write to stdin? Then remove stdin from poll set. */
             rc = RTPollSetRemove(hPollSet, VBOXSERVICECTRLPIPEID_STDIN_WRITABLE);
             AssertRC(rc);
@@ -167 +180 @@
 }
 
-
+/**
+ *
+ *
+ * @returns IPRT status code.
+ * @param   hPollSet
+ * @param   fPollEvt
+ * @param   phStdInW
+ * @param   uHandleId
+ * @param   pStdInBuf
+ */
 static int VBoxServiceControlExecProcHandleInputEvent(RTPOLLSET hPollSet, uint32_t fPollEvt, PRTPIPE phStdInW,
                                                       uint32_t uHandleId, PVBOXSERVICECTRLEXECPIPEBUF pStdInBuf)
 {
+#ifdef DEBUG
     VBoxServiceVerbose(4, "ControlExec: HandleInputEvent: fPollEvt=%#x\n", fPollEvt);
-
+#endif
     int rc = VINF_SUCCESS;
     if (fPollEvt & RTPOLL_EVT_ERROR)
@@ -240 +263 @@
 
     /*
-     * If an error was raised signalled,
+     * If an error was signalled, close reading stdout pipe.
      */
     if (fPollEvt & RTPOLL_EVT_ERROR)
@@ -327 +350 @@
         if (RT_SUCCESS(rc2))
         {
+#ifdef DEBUG
             VBoxServiceVerbose(4, "ControlExec: RTPollNoResume idPollHnd=%u\n", idPollHnd);
+#endif
             switch (idPollHnd)
             {
@@ -336 +361 @@
 
                 case VBOXSERVICECTRLPIPEID_STDIN_WRITABLE:
-                    rc = VBoxServiceControlExecProcHandleStdInWritableEvent(hPollSet, fPollEvt, &hStdInW, &pData->stdIn);
+                {
+                    uint32_t cbWritten;
+                    rc = VBoxServiceControlExecProcHandleStdInWritableEvent(hPollSet, fPollEvt, &hStdInW,
+                                                                            &pData->stdIn, &cbWritten);
+                    if (RT_SUCCESS(rc))
+                    {
+                        rc = VbglR3GuestCtrlExecReportStatusIn(pThread->uClientID, pThread->uContextID, pData->uPID,
+                                                               0 /* Flags */, cbWritten);
+                    }
                     break;
+                }
 
                 case VBOXSERVICECTRLPIPEID_STDOUT:
@@ -597 +631 @@
     pBuf->cbSize = 0;
     pBuf->cbProcessed = 0;
-    pBuf->fAlive = true;
+    pBuf->fAlive = false;
 
     return RTCritSectInit(&pBuf->CritSect);
@@ -612 +646 @@
         pBuf->cbSize = 0;
         pBuf->cbProcessed = 0;
-    }
-    pBuf->fAlive = false;
+        pBuf->fAlive = false;
+    }
     return RTCritSectDelete(&pBuf->CritSect);
 }
@@ -656 +690 @@
     if (RT_SUCCESS(rc))
     {
-        if (pBuf->fAlive)
-        {
+        /*if (pBuf->fAlive)
+        {*/
             /** @todo Buffer size limit! 4MB */
 
@@ -677 +711 @@
                 pBuf->cbSize += cbData;
                 /** @todo Add offset clamping! */
+                pBuf->fAlive = true;
             }
             else
                 rc = VERR_NO_MEMORY;
-        }
+        //}
         int rc2 = RTCritSectLeave(&pBuf->CritSect);
         if (RT_SUCCESS(rc))
@@ -1189 +1224 @@
         VBoxServiceError("ControlExec: Failed to retrieve exec input command! Error: %Rrc\n", rc);
     }
-    else
-    {
+    else if (   cbSize > 0
+             && cbSize < sizeof(aBuffer))
+    {
+#ifdef DEBUG
+        VBoxServiceVerbose(4, "ControlExec: Input (PID %u) received: cbSize=%u\n", uPID, cbSize);
+#endif
         PVBOXSERVICECTRLTHREAD pNode = VBoxServiceControlExecFindProcess(uPID);
         if (pNode)
@@ -1199 +1238 @@
             if (RT_SUCCESS(rc))
             {
+#ifdef DEBUG
+                VBoxServiceVerbose(4, "ControlExec: Written to StdIn buffer (PID %u): cbAlloc=%u, cbSize=%u, cbProc=%u\n",
+                                   uPID, pData->stdIn.cbAllocated, pData->stdIn.cbSize,
+                                   pData->stdIn.cbProcessed);
+#endif
+#if 0
                 size_t cbWritten;
                 rc = VBoxServiceControlExecProcWriteStdIn(&pData->stdIn, pData->pipeStdInW, &cbWritten);
                 if (RT_SUCCESS(rc))
+                {
                     rc = VbglR3GuestCtrlExecReportStatusIn(u32ClientId, uContextID, uPID, 0 /* Flags */,
                                                            cbWritten);
+                }
+#endif
             }
         }
@@ -1209 +1257 @@
             rc = VERR_NOT_FOUND; /* PID not found! */
     }
+    else
+        rc = VERR_INVALID_PARAMETER;
     VBoxServiceVerbose(3, "ControlExec: VBoxServiceControlExecHandleCmdSetInput returned with %Rrc\n", rc);
     return rc;