Changeset 24874 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 23, 2009 3:37:58 PM (15 years ago)

Author:

vboxsync

Message:

Main,VMM,VBoxManage: Added a parameter to IConsole::Teleport for specifying a max downtime and made PGM compare this against a rough estimate of the time it would take to deal with the rest of the pages.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImplTeleporter.cpp (modified) (6 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/ConsoleImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImplTeleporter.cpp

@@ -92 +92 @@
     Utf8Str             mstrHostname;
     uint32_t            muPort;
+    uint32_t            mcMsMaxDowntime;
     MachineState_T      menmOldMachineState;
     bool                mfSuspendedByUs;
@@ -99 +100 @@
         : TeleporterState(pConsole, pVM, pProgress, true /*fIsSource*/)
         , muPort(UINT32_MAX)
+        , mcMsMaxDowntime(250)
         , menmOldMachineState(enmOldMachineState)
         , mfSuspendedByUs(false)
@@ -640 +642 @@
 
     void *pvUser = static_cast<void *>(static_cast<TeleporterState *>(pState));
-    vrc = VMR3Teleport(pState->mpVM, &g_teleporterTcpOps, pvUser, teleporterProgressCallback, pvUser, &pState->mfSuspendedByUs);
+    vrc = VMR3Teleport(pState->mpVM, pState->mcMsMaxDowntime,
+                       &g_teleporterTcpOps, pvUser,
+                       teleporterProgressCallback, pvUser,
+                       &pState->mfSuspendedByUs);
     if (RT_FAILURE(vrc))
         return setError(E_FAIL, tr("VMR3Teleport -> %Rrc"), vrc);
@@ -854 +859 @@
  * @returns COM status code.
  *
- * @param   aHostname   The name of the target host.
- * @param   aPort       The TCP port number.
- * @param   aPassword   The password.
- * @param   aProgress   Where to return the progress object.
+ * @param   aHostname       The name of the target host.
+ * @param   aPort           The TCP port number.
+ * @param   aPassword       The password.
+ * @param   aMaxDowntime    Max allowed "downtime" in milliseconds.
+ * @param   aProgress       Where to return the progress object.
  */
 STDMETHODIMP
-Console::Teleport(IN_BSTR aHostname, ULONG aPort, IN_BSTR aPassword, IProgress **aProgress)
+Console::Teleport(IN_BSTR aHostname, ULONG aPort, IN_BSTR aPassword, ULONG aMaxDowntime, IProgress **aProgress)
 {
     /*
@@ -870 +876 @@
     CheckComArgNotNull(aHostname);
     CheckComArgExprMsg(aPort, aPort > 0 && aPort <= 65535, ("is %u", aPort));
+    CheckComArgExprMsg(aMaxDowntime, aMaxDowntime > 0, ("is %u", aMaxDowntime));
 
     AutoCaller autoCaller(this);
@@ -903 +910 @@
 
     TeleporterStateSrc *pState = new TeleporterStateSrc(this, mpVM, ptrProgress, mMachineState);
-    pState->mstrPassword = aPassword;
-    pState->mstrHostname = aHostname;
-    pState->muPort       = aPort;
+    pState->mstrPassword    = aPassword;
+    pState->mstrHostname    = aHostname;
+    pState->muPort          = aPort;
+    pState->mcMsMaxDowntime = aMaxDowntime;
 
     void *pvUser = static_cast<void *>(static_cast<TeleporterState *>(pState));

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

@@ -6442 +6442 @@
   <interface
      name="IConsole" extends="$unknown"
-     uuid="55dd56a5-1d1d-4d81-b742-b082b9571be6"
+     uuid="6375231a-c17c-464b-92cb-ae9e128d71c3"
      wsmap="managed"
      >
@@ -7147 +7147 @@
       <param name="password" type="wstring" dir="in">
         <desc>The password.</desc>
+      </param>
+      <param name="maxDowntime" type="unsigned long" dir="in">
+        <desc>
+          The maximum allowed downtime given as milliseconds.  0 is not a valid
+          value.  Recommended value: 250 ms.
+
+          The higher the value is, the greater the chance for a successful
+          teleportation.  A small value may easily result in the teleportation
+          process taking hours and eventually fail.
+
+          <note>
+            The current implementation treats this a guideline, not as an
+            absolute rule.
+          </note>
+        </desc>
       </param>
       <param name="progress" type="IProgress" dir="return">

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

@@ -147 +147 @@
     STDMETHOD(DeleteSnapshot)(IN_BSTR aId, IProgress **aProgress);
     STDMETHOD(RestoreSnapshot)(ISnapshot *aSnapshot, IProgress **aProgress);
-    STDMETHOD(Teleport)(IN_BSTR aHostname, ULONG aPort, IN_BSTR aPassword, IProgress **aProgress);
+    STDMETHOD(Teleport)(IN_BSTR aHostname, ULONG aPort, IN_BSTR aPassword, ULONG aMaxDowntime, IProgress **aProgress);
     STDMETHOD(RegisterCallback) (IConsoleCallback *aCallback);
     STDMETHOD(UnregisterCallback)(IConsoleCallback *aCallback);