Changeset 28132 in vbox for trunk

Timestamp:

Apr 9, 2010 10:02:00 AM (15 years ago)

Author:

vboxsync

Message:

Guest Control: Update (fixed leak in host service, --wait option for VBoxManage).

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (4 diffs)
• HostServices/GuestControl/service.cpp (modified) (3 diffs)
• Main/GuestImpl.cpp (modified) (4 diffs)

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

@@ -65 +65 @@
              "                            <path to program> [--arguments \"<arguments>\"] [--environment \"NAME=VALUE NAME=VALUE\"]\n"
              "                            [--flags <flags>] [--username <name> [--password <password>]]\n"
-             "                            [--timeout <msec>]\n"
+             "                            [--timeout <msec>] [--wait stdout[,[stderr]]]\n"
              "\n");
 }
@@ -91 +91 @@
     Utf8Str Utf8Password;
     uint32_t uTimeoutMS = 0;
+    bool waitForOutput = false;
 
     /* Iterate through all possible commands (if available). */
@@ -175 +176 @@
             else
                 ++i;
+        }
+        else if (!strcmp(a->argv[i], "--wait"))
+        {
+            if (i + 1 >= a->argc)
+                usageOK = false;
+            else
+            {
+                /** @todo Check for "stdout" or "stderr"! */
+                waitForOutput = true;
+                ++i;
+            }
         }
         /** @todo Add fancy piping stuff here. */
@@ -231 +243 @@
                                                     Bstr(Utf8UserName), Bstr(Utf8Password), uTimeoutMS,
                                                     &uPID, progress.asOutParam()));
+            if (waitForOutput)
+            {
+
+            }
             /** @todo Show some progress here? */
             a->session->Close();

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

@@ -453 +453 @@
                  rc = execBufferAssign(&curCmd.parmBuf, cParms, paParms);
                  if (RT_SUCCESS(rc))
+                 {
+                     execBufferFree(&curCmd.parmBuf);
                      mHostCmds.pop_front();
+                 }
              }
         }
@@ -487 +490 @@
     int rc = VINF_SUCCESS;
 
-    HostCmd newCmd;
-    execBufferAllocate(&newCmd.parmBuf, cParms, paParms);
-    mHostCmds.push_back(newCmd);
-
-    /* Limit list size by deleting oldest element. */
-    if (mHostCmds.size() > 256) /** @todo Use a define! */
-        mHostCmds.pop_front();
-
     /* Some lazy guests to wake up? */
     if (!mGuestWaiters.empty())
@@ -501 +496 @@
         rc = hostNotifyGuest(&curCall, eFunction, cParms, paParms);
         mGuestWaiters.pop_front();
+    }
+    else /* No guests waiting, buffer it */
+    {
+        HostCmd newCmd;
+        rc = execBufferAllocate(&newCmd.parmBuf, cParms, paParms);
+        if (RT_SUCCESS(rc))
+        {
+            mHostCmds.push_back(newCmd);
+        
+            /* Limit list size by deleting oldest element. */
+            if (mHostCmds.size() > 256) /** @todo Use a define! */
+                mHostCmds.pop_front();
+        }
     }
     return rc;

trunk/src/VBox/Main/GuestImpl.cpp

@@ -26 +26 @@
 #include "Global.h"
 #include "ConsoleImpl.h"
+#include "ProgressImpl.h"
 #include "VMMDev.h"
 
@@ -448 +449 @@
 
     CheckComArgStrNotEmptyOrNull(aCommand);
+    CheckComArgOutPointerValid(aPID);
     CheckComArgOutPointerValid(aProgress);
-    CheckComArgOutPointerValid(aPID);
-    /* Flags are not supported at the moment. */
-    if (aFlags != 0)
+    if (aFlags != 0) /* Flags are not supported at the moment. */
         return E_INVALIDARG;
 
@@ -461 +461 @@
         if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-        /* Just be on the safe side when calling another process. */
-        alock.leave();
-
-        HRESULT rc = E_UNEXPECTED;
-        using namespace guestControl;
-
+        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+        /*
+         * Create progress object.
+         */
+#if 0
+        ComObjPtr <Progress> progress;
+        progress.createObject();
+        HRESULT rc = progress->init(/** @todo How to get the machine here? */
+                                    static_cast<IGuest*>(this),
+                                    BstrFmt(tr("Executing process")),
+                                    FALSE);
+        if (FAILED(rc)) return rc;
+#endif
+
+        /*
+         * Prepare process execution.
+         */
         int vrc = VINF_SUCCESS;
         Utf8Str Utf8Command(aCommand);
@@ -547 +557 @@
             }
             if (RT_SUCCESS(vrc))
+            {
+#if 0
+                progress.queryInterfaceTo(aProgress);
+#endif
                 rc = S_OK;
+            }
             else
                 rc = setError(E_UNEXPECTED,