Changeset 24614 in vbox for trunk/src

Timestamp:

Nov 12, 2009 5:09:46 PM (15 years ago)

Author:

vboxsync

Message:

ConsoleImplTeleporter.cpp: changed to VM hand over and TCP disconnecting point.

File:

• trunk/src/VBox/Main/ConsoleImplTeleporter.cpp (modified) (14 diffs)

trunk/src/VBox/Main/ConsoleImplTeleporter.cpp

@@ -117 +117 @@
     PRTTCPSERVER                mhServer;
     PRTTIMERLR                  mphTimerLR;
-    bool                        mfStartPaused;
     bool                        mfLockedMedia;
     int                         mRc;
@@ -129 +128 @@
         , mhServer(NULL)
         , mphTimerLR(phTimerLR)
-        , mfStartPaused(false)
         , mfLockedMedia(false)
         , mRc(VINF_SUCCESS)
@@ -637 +635 @@
 
     /*
-     * If we're paused, mention this to the target side.
-     *
-     * Note: This means you have to resume the target manually if you pause it
-     *       during the teleportation.
-     */
-    if (    vrc == VINF_SSM_LIVE_SUSPENDED
-        ||  pState->menmOldMachineState == MachineState_Paused)
-    {
-        hrc = teleporterSrcSubmitCommand(pState, "pause");
-        if (FAILED(hrc))
-            return hrc;
-    }
-
-    /*
      * We're at the point of no return.
      */
@@ -660 +644 @@
 
     /*
-     * The last thing we do is to hand over any media we might have locked.
+     * Hand over any media which we might be sharing.
+     *
+     * Note! This is only important on localhost teleportations.
      */
     /** @todo Maybe we should only do this if it's a local teleportation... */
@@ -672 +658 @@
         return hrc;
 
-    hrc = teleporterSrcSubmitCommand(pState, "done");
+    /*
+     * The FINAL step is giving the target instructions how to proceed with the VM.
+     */
+    if (    vrc == VINF_SSM_LIVE_SUSPENDED
+        ||  pState->menmOldMachineState == MachineState_Paused)
+        hrc = teleporterSrcSubmitCommand(pState, "hand-over-paused");
+    else
+        hrc = teleporterSrcSubmitCommand(pState, "hand-over-resume");
     if (FAILED(hrc))
         return hrc;
@@ -705 +698 @@
     if (SUCCEEDED(hrc))
         hrc = pState->mptrConsole->teleporterSrc(pState);
+
+    /* Close the connection ASAP on so that the other side can complete. */
+    if (pState->mhSocket != NIL_RTSOCKET)
+    {
+        RTTcpClientClose(pState->mhSocket);
+        pState->mhSocket = NIL_RTSOCKET;
+    }
 
     /* Aaarg! setMachineState trashes error info on Windows, so we have to
@@ -714 +714 @@
     pState->mptrProgress->setCancelCallback(NULL, NULL);
 
-    /* Write lock the console before resetting mptrCancelableProgress and fixing the state.  */
+    /*
+     * Write lock the console before resetting mptrCancelableProgress and
+     * fixing the state.
+     */
     AutoWriteLock autoLock(pState->mptrConsole);
     pState->mptrConsole->mptrCancelableProgress.setNull();
@@ -825 +828 @@
      * Cleanup.
      */
-    if (pState->mhSocket != NIL_RTSOCKET)
-    {
-        RTTcpClientClose(pState->mhSocket);
-        pState->mhSocket = NIL_RTSOCKET;
-    }
+    Assert(pState->mhSocket == NIL_RTSOCKET);
     delete pState;
 
@@ -1020 +1019 @@
                 {
                     vrc = State.mRc;
-                    if (RT_SUCCESS(vrc))
-                    {
-                        if (State.mfStartPaused)
-                            setMachineState(MachineState_Paused);
-                        else
-                            vrc = VMR3Resume(pVM);
-                    }
                     /* Power off the VM on failure unless the state callback
                        already did that. */
-                    else
+                    if (RT_FAILURE(vrc))
                     {
                         VMSTATE enmVMState = VMR3GetState(pVM);
@@ -1103 +1095 @@
 
 
-static int teleporterTcpWriteACK(TeleporterStateTrg *pState)
+static int teleporterTcpWriteACK(TeleporterStateTrg *pState, bool fAutomaticUnlock = true)
 {
     int rc = RTTcpWrite(pState->mhSocket, "ACK\n", sizeof("ACK\n") - 1);
@@ -1109 +1101 @@
     {
         LogRel(("Teleporter: RTTcpWrite(,ACK,) -> %Rrc\n", rc));
-        teleporterTrgUnlockMedia(pState);
+        if (fAutomaticUnlock)
+            teleporterTrgUnlockMedia(pState);
     }
     RTTcpFlush(pState->mhSocket);
@@ -1237 +1230 @@
             vrc = VERR_SSM_CANCELLED;
         }
-        else if (!strcmp(szCmd, "pause"))
-        {
-            pState->mfStartPaused = true;
-            vrc = teleporterTcpWriteACK(pState);
-        }
         else if (!strcmp(szCmd, "lock-media"))
         {
@@ -1256 +1244 @@
             }
         }
-        else if (!strcmp(szCmd, "done"))
+        else if (   !strcmp(szCmd, "hand-over-resume")
+                 || !strcmp(szCmd, "hand-over-paused"))
         {
             /*
-             * The ACK is the point of no return.
+             * Point of no return.
+             *
+             * Note! Since we cannot tell whether a VMR3Resume failure is
+             *       destructive for the source or not, we have little choice
+             *       but to ACK it first and take any failures locally.
+             *
+             *       Ideally, we should try resume it first and then ACK (or
+             *       NACK) the request since this would reduce latency and
+             *       make it possible to recover from some VMR3Resume failures.
              */
             if (   pState->mptrProgress->notifyPointOfNoReturn()
                 && pState->mfLockedMedia)
+            {
                 vrc = teleporterTcpWriteACK(pState);
+                if (RT_SUCCESS(vrc))
+                {
+                    if (!strcmp(szCmd, "hand-over-resume"))
+                        vrc = VMR3Resume(pState->mpVM);
+                    else
+                        pState->mptrConsole->setMachineState(MachineState_Paused);
+                    fDone = true;
+                    break;
+                }
+            }
             else
             {
@@ -1269 +1277 @@
                 teleporterTcpWriteNACK(pState, vrc);
             }
-            fDone = true;
-            break;
         }
         else