Changeset 27945 in vbox

Timestamp:

Apr 1, 2010 3:20:08 PM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Update (added dummy IProgress, update to host service).

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/VBoxServiceControl.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (5 diffs)
• HostServices/GuestControl/service.cpp (modified) (10 diffs)
• Main/GuestImpl.cpp (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/GuestImpl.h (modified) (1 diff)

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

@@ -112 +112 @@
                                            execData.szPassword, sizeof(execData.szPassword),
                                            &execData.uTimeLimitMS);
-    if (RT_SUCCESS(rc))
+    if (RT_FAILURE(rc))
+    {
+        VBoxServiceError("Control: Failed to retrieve execution command! Error: %Rrc\n", rc);
+    }
+    else
     {
         /* Adjust time limit value. */

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

@@ -37 +37 @@
 #include <VBox/log.h>
 #include <iprt/asm.h>
+#include <iprt/getopt.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>
@@ -62 +63 @@
 {
     RTPrintf("VBoxManage guestcontrol     execute <vmname>|<uuid>\n"
-             "                            <path to program> [--arguments <arguments>] [--environment NAME=VALUE]\n"
+             "                            <path to program> [--arguments \"<arguments>\"] [--environment \"NAME=VALUE NAME=VALUE\"]\n"
              "                            [--flags <flags>] [--username <name> [--password <password>]]\n"
              "                            [--timeout <msec>]\n"
@@ -108 +109 @@
                  || !strcmp(a->argv[i], "--env"))
         {
-            /** @todo Allow more environment blocks be spcecified per "--environment"
-              *       option, e.g. "--environment "FOO=BAR HOHO=HEHE;QWER=ASDF". */
             if (i + 1 >= a->argc)
                 usageOK = false;
             else
             {                
-                env.push_back(Bstr(a->argv[i + 1]));
+                char **papszArg;
+                int cArgs;
+
+                rc = RTGetOptArgvFromString(&papszArg, &cArgs, a->argv[i + 1], NULL);
+                if (RT_SUCCESS(rc))
+                {
+                    for (int a = 0; a < cArgs; a++)                       
+                        env.push_back(Bstr(papszArg[a]));
+
+                    RTGetOptArgvFree(papszArg);
+                }                
                 ++i;
             }
@@ -204 +213 @@
             CHECK_ERROR_BREAK(console, COMGETTER(Guest)(guest.asOutParam()));
 
+            ComPtr<IProgress> progress;
             ULONG uPID = 0;
             CHECK_ERROR_BREAK(guest, ExecuteProgram(Bstr(Utf8Cmd), uFlags, 
@@ -209 +219 @@
                                                     Bstr(Utf8StdIn), Bstr(Utf8StdOut), Bstr(Utf8StdErr),
                                                     Bstr(Utf8UserName), Bstr(Utf8Password), uTimeoutMS,
-                                                    &uPID));
+                                                    &uPID, progress.asOutParam()));
+            /** @todo Show some progress here? */
             a->session->Close();
         } while (0);

trunk/src/VBox/HostServices/GuestControl/service.cpp

@@ -36 +36 @@
 #include <iprt/cpp/autores.h>
 #include <iprt/cpp/utils.h>
+#include <iprt/critsect.h>
 #include <iprt/err.h>
 #include <iprt/mem.h>
@@ -77 +78 @@
     /** The execution data to hold (atm only one buffer!) */
     VBOXGUESTCTRPARAMBUFFER mExec;
+    RTCRITSECT critsect;
 
 public:
@@ -93 +95 @@
                                 "GuestCtrlReq");
 #endif
+        mExec.uParmCount = 0;
+        mExec.pParms = NULL;
+
+        if (RT_SUCCESS(rc))
+            rc = RTCritSectInit(&critsect);
+
         if (RT_FAILURE(rc))
             throw rc;
@@ -204 +212 @@
 int Service::execBufferAllocate(PVBOXGUESTCTRPARAMBUFFER pBuf, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
+    RTCritSectEnter(&critsect);
+
     AssertPtr(pBuf);
     int rc = VINF_SUCCESS;
@@ -260 +270 @@
         }
     }
+    RTCritSectLeave(&critsect);
     return rc;
 }
@@ -266 +277 @@
 void Service::execBufferFree(PVBOXGUESTCTRPARAMBUFFER pBuf)
 {
+    RTCritSectEnter(&critsect);
     AssertPtr(pBuf);
     for (uint32_t i = 0; i < pBuf->uParmCount; i++)
@@ -272 +284 @@
         {
             case VBOX_HGCM_SVC_PARM_PTR:
-                RTMemFree(pBuf->pParms[i].u.pointer.addr);
+                if (pBuf->pParms[i].u.pointer.size > 0)
+                    RTMemFree(pBuf->pParms[i].u.pointer.addr);
                 break;
         }
@@ -281 +294 @@
         pBuf->uParmCount = 0;
     }
+    RTCritSectLeave(&critsect);
 }
 
@@ -286 +300 @@
 int Service::execBufferAssign(PVBOXGUESTCTRPARAMBUFFER pBuf, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
+    execBufferFree(pBuf);
+
+    RTCritSectEnter(&critsect);
+
     AssertPtr(pBuf);
+    int rc = VINF_SUCCESS;
     if (cParms != pBuf->uParmCount)
-        return VERR_INVALID_PARAMETER;
-    /** @todo Add check to verify if the HGCM request is the same *type* as the buffered one! */
-
-    for (uint32_t i = 0; i < pBuf->uParmCount; i++)
-    {
-        paParms[i].type = pBuf->pParms[i].type;
-        switch (paParms[i].type)
-        {
-            case VBOX_HGCM_SVC_PARM_32BIT:
-                paParms[i].u.uint32 = pBuf->pParms[i].u.uint32;
-                break;
-
-            case VBOX_HGCM_SVC_PARM_64BIT:
-                /* Not supported yet. */
-                break;
-
-            case VBOX_HGCM_SVC_PARM_PTR:
-                paParms[i].u.pointer.size = pBuf->pParms[i].u.pointer.size;
-                paParms[i].u.pointer.addr = pBuf->pParms[i].u.pointer.addr;
-                break;
-
-            default:                        
-                break;
-        }
-    }
-
-    return VINF_SUCCESS;
+    {
+        rc = VERR_INVALID_PARAMETER;
+    }
+    else
+    {
+        /** @todo Add check to verify if the HGCM request is the same *type* as the buffered one! */    
+        for (uint32_t i = 0; i < pBuf->uParmCount; i++)
+        {
+            paParms[i].type = pBuf->pParms[i].type;
+            switch (paParms[i].type)
+            {
+                case VBOX_HGCM_SVC_PARM_32BIT:
+                    paParms[i].u.uint32 = pBuf->pParms[i].u.uint32;
+                    break;
+    
+                case VBOX_HGCM_SVC_PARM_64BIT:
+                    /* Not supported yet. */
+                    break;
+    
+                case VBOX_HGCM_SVC_PARM_PTR:
+                    memcpy(paParms[i].u.pointer.addr,
+                           pBuf->pParms[i].u.pointer.addr,
+                           pBuf->pParms[i].u.pointer.size);
+                    break;
+    
+                default:                        
+                    break;
+            }
+        }
+    }
+    RTCritSectLeave(&critsect);
+    return rc;
 }
 
@@ -333 +357 @@
     LogFlowFunc(("u32ClientID = %d, fn = %d, cParms = %d, pparms = %d\n",
                  u32ClientID, eFunction, cParms, paParms));
+
+    ASMBreakpoint();
+
     try
     {

trunk/src/VBox/Main/GuestImpl.cpp

@@ -423 +423 @@
                                    IN_BSTR aStdIn, IN_BSTR aStdOut, IN_BSTR aStdErr,
                                    IN_BSTR aUserName, IN_BSTR aPassword,
-                                   ULONG aTimeoutMS, ULONG *aPID)
+                                   ULONG aTimeoutMS, ULONG *aPID, IProgress **aProgress)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -431 +431 @@
 
     CheckComArgStrNotEmptyOrNull(aCommand);
+    CheckComArgOutPointerValid(aProgress);
     CheckComArgOutPointerValid(aPID);
     /* Flags are not supported at the moment. */

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

@@ -8353 +8353 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="66dfe00b-f174-40d8-9d78-4e30d58137ed"
+     uuid="a4dac036-f7ed-4634-98d8-44b8672b1779"
      wsmap="managed"
      >
@@ -8528 +8528 @@
         <desc>Foobar</desc>
       </param>
-      <param name="pid" type="unsigned long" dir="return">
+      <param name="pid" type="unsigned long" dir="out">
         <desc>Foobar</desc>
       </param>
-    </method>
+      <param name="progress" type="IProgress" dir="return">
+        <desc>Progress object to track the operation completion.</desc>
+      </param>
+      </method>
 
   </interface>

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

@@ -87 +87 @@
                               IN_BSTR aStdIn, IN_BSTR aStdOut, IN_BSTR aStdErr,
                               IN_BSTR aUserName, IN_BSTR aPassword,
-                              ULONG aTimeoutMS, ULONG* aPID);
+                              ULONG aTimeoutMS, ULONG* aPID, IProgress **aProgress);
     STDMETHOD(InternalGetStatistics)(ULONG aCpuId, ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle, 
                                      ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemCache,