Changeset 34867 in vbox for trunk/src

Timestamp:

Dec 9, 2010 10:33:41 AM (14 years ago)

Author:

vboxsync

Message:

GuestControl/VBoxService: Implemented dynamic input buffer size handling, raised default 64K -> 1MB.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControl.cpp (modified) (1 diff)
• VBoxServiceControlExec.cpp (modified) (9 diffs)
• VBoxServiceInternal.h (modified) (2 diffs)

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

@@ -153 +153 @@
 
                 case HOST_EXEC_SET_INPUT:
-                    rc = VBoxServiceControlExecHandleCmdSetInput(g_GuestControlSvcClientID, uNumParms);
+                    /** @todo Make buffer size configurable via guest properties/argv! */
+                    rc = VBoxServiceControlExecHandleCmdSetInput(g_GuestControlSvcClientID, uNumParms, _1M /* Buffer size */);
                     break;
 

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

@@ -104 +104 @@
     {
         size_t cbToWrite = pStdInBuf->cbSize - pStdInBuf->cbOffset;
-        cbToWrite = RT_MIN(cbToWrite, _64K);
+        cbToWrite = RT_MIN(cbToWrite, _1M);
         *pfClose = false;
         if (cbToWrite && pStdInBuf->fAlive)
@@ -1597 +1597 @@
  *                                      offering.
  */
-int VBoxServiceControlExecHandleCmdSetInput(uint32_t u32ClientId, uint32_t uNumParms)
+int VBoxServiceControlExecHandleCmdSetInput(uint32_t u32ClientId, uint32_t uNumParms, size_t cbMaxBufSize)
 {
     uint32_t uContextID;
     uint32_t uPID;
     uint32_t uFlags;
-    uint8_t  abBuffer[_64K];
     uint32_t cbSize;
 
-    if (uNumParms != 5)
-        return VERR_INVALID_PARAMETER;
+    AssertReturn(RT_IS_POWER_OF_TWO(cbMaxBufSize), VERR_INVALID_PARAMETER);
+    uint8_t *pabBuffer = (uint8_t*)RTMemAlloc(cbMaxBufSize);
+    AssertPtrReturn(pabBuffer, VERR_NO_MEMORY);
 
     /*
@@ -1613 +1613 @@
     int rc = VbglR3GuestCtrlExecGetHostCmdInput(u32ClientId, uNumParms,
                                                 &uContextID, &uPID, &uFlags,
-                                                abBuffer, sizeof(abBuffer), &cbSize);
+                                                pabBuffer, cbMaxBufSize, &cbSize);
     if (RT_FAILURE(rc))
     {
@@ -1619 +1619 @@
     }
     else if (   cbSize <= 0
-             || cbSize > sizeof(abBuffer))
+             || cbSize >  cbMaxBufSize)
     {
         VBoxServiceError("ControlExec: Input size is invalid! cbSize=%u\n", cbSize);
@@ -1652 +1652 @@
              */
             uint32_t cbWritten;
-            rc = VBoxServiceControlExecWritePipeBuffer(&pData->stdIn, abBuffer, cbSize, fPendingClose, &cbWritten);
+            rc = VBoxServiceControlExecWritePipeBuffer(&pData->stdIn, pabBuffer, cbSize, fPendingClose, &cbWritten);
 #ifdef DEBUG
             VBoxServiceVerbose(4, "ControlExec: Written to StdIn buffer (PID %u): rc=%Rrc, uFlags=0x%x, cbAlloc=%u, cbSize=%u, cbOffset=%u\n",
@@ -1692 +1692 @@
             rc = VERR_NOT_FOUND; /* PID not found! */
     }
+    RTMemFree(pabBuffer);
     VBoxServiceVerbose(3, "ControlExec: VBoxServiceControlExecHandleCmdSetInput returned with %Rrc\n", rc);
     return rc;
@@ -1713 +1714 @@
     int rc = VbglR3GuestCtrlExecGetHostCmdOutput(u32ClientId, uNumParms,
                                                  &uContextID, &uPID, &uHandleID, &uFlags);
-    if (RT_FAILURE(rc))
-    {
-        VBoxServiceError("ControlExec: Failed to retrieve exec output command! Error: %Rrc\n", rc);
-    }
-    else
+    if (RT_SUCCESS(rc))
     {
         PVBOXSERVICECTRLTHREAD pNode = VBoxServiceControlExecFindProcess(uPID);
@@ -1725 +1722 @@
             AssertPtr(pData);
 
-            const uint32_t cbSize = _4K;
+            const uint32_t cbSize = _1M;
             uint32_t cbRead = cbSize;
             uint8_t *pBuf = (uint8_t*)RTMemAlloc(cbSize);
@@ -1749 +1746 @@
             rc = VERR_NOT_FOUND; /* PID not found! */
     }
+    else
+        VBoxServiceError("ControlExec: Failed to retrieve exec output command! Error: %Rrc\n", rc);
     VBoxServiceVerbose(3, "ControlExec: VBoxServiceControlExecHandleCmdGetOutput returned with %Rrc\n", rc);
     return rc;

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -93 +93 @@
 
 /** The service name (needed for mutex creation on Windows). */
-#define VBOXSERVICE_NAME           "VBoxService"
+#define VBOXSERVICE_NAME            "VBoxService"
 
 #ifdef RT_OS_WINDOWS
@@ -292 +292 @@
 #ifdef VBOX_WITH_GUEST_CONTROL
 extern int          VBoxServiceControlExecHandleCmdStartProcess(uint32_t u32ClientId, uint32_t uNumParms);
-extern int          VBoxServiceControlExecHandleCmdSetInput(uint32_t u32ClientId, uint32_t uNumParms);
+extern int          VBoxServiceControlExecHandleCmdSetInput(uint32_t u32ClientId, uint32_t uNumParms, size_t cbMaxBufSize);
 extern int          VBoxServiceControlExecHandleCmdGetOutput(uint32_t u32ClientId, uint32_t uNumParms);
 extern int          VBoxServiceControlExecProcess(uint32_t uContext, const char *pszCmd, uint32_t uFlags,