Changeset 32268 in vbox for trunk/src/VBox

Timestamp:

Sep 7, 2010 9:40:47 AM (14 years ago)

Author:

vboxsync

Message:

FT updates

Location:

trunk/src/VBox/VMM

Files:

• FTM.cpp (modified) (5 diffs)
• FTMInternal.h (modified) (3 diffs)

trunk/src/VBox/VMM/FTM.cpp

@@ -92 +92 @@
 *******************************************************************************/
 static const char g_szWelcome[] = "VirtualBox-Fault-Tolerance-Sync-1.0\n";
+
+static DECLCALLBACK(int) ftmR3PageTreeDestroyCallback(PAVLOGCPHYSNODECORE pBaseNode, void *pvUser);
 
 /**
@@ -171 +173 @@
         RTMemFree(pVM->ftm.s.pszPassword);
 
+    /* Remove all pending memory updates. */
+    if (pVM->ftm.s.standby.ppPhysPageTree)
+    {
+        RTAvloGCPhysDestroy(pVM->ftm.s.standby.ppPhysPageTree, ftmR3PageTreeDestroyCallback, NULL);
+        pVM->ftm.s.standby.ppPhysPageTree = NULL;
+    }
+
     pVM->ftm.s.pszAddress  = NULL;
     pVM->ftm.s.pszPassword = NULL;
@@ -797 +806 @@
 
 /**
+ * Syncs memory from the master VM
+ *
+ * @returns VBox status code.
+ * @param   pVM             VM Handle.
+ */
+static int ftmR3SyncMem(PVM pVM)
+{
+    while (true)
+    {
+        FTMTCPHDRMEM Hdr;
+        void *pPage;
+        RTGCPHYS GCPhys;
+
+        /* Read memory header. */
+        int rc = RTTcpRead(pVM->ftm.s.hSocket, &Hdr, sizeof(Hdr), NULL);
+        if (RT_FAILURE(rc))
+        {
+            Log(("RTTcpRead failed with %Rrc\n", rc));
+            break;
+        }
+        pVM->ftm.s.StatReceivedMem.c += sizeof(Hdr);
+
+        if (Hdr.cb == 0)
+            break;  /* end of sync. */
+
+        Assert(Hdr.cb == Hdr.cbPageRange);  /** @todo uncompress */
+        GCPhys = Hdr.GCPhys;
+
+        /* Must be a multiple of PAGE_SIZE. */
+        Assert((Hdr.cbPageRange & 0xfff) == 0);
+
+        while (Hdr.cbPageRange)
+        {
+            PFTMPHYSPAGETREENODE pNode = (PFTMPHYSPAGETREENODE)RTAvloGCPhysGet(pVM->ftm.s.standby.ppPhysPageTree, GCPhys);
+            if (!pNode)
+            {
+                /* Allocate memory for the node and page. */
+                pNode = (PFTMPHYSPAGETREENODE)RTMemAllocZ(sizeof(*pNode) + PAGE_SIZE);
+                AssertBreak(pNode);
+
+                /* Insert the node into the tree. */
+                pNode->Core.Key = GCPhys;
+                pNode->pPage = (void *)(pNode + 1);
+                bool fRet = RTAvloGCPhysInsert(pVM->ftm.s.standby.ppPhysPageTree, &pNode->Core);
+                Assert(fRet);
+            }
+            pPage = pNode->pPage;
+
+            /* Fetch the page. */
+            rc = RTTcpRead(pVM->ftm.s.hSocket, pPage, PAGE_SIZE, NULL);
+            if (RT_FAILURE(rc))
+            {
+                Log(("RTTcpRead page data (%d bytes) failed with %Rrc\n", Hdr.cb, rc));
+                break;
+            }
+            pVM->ftm.s.StatReceivedMem.c += PAGE_SIZE;
+            Hdr.cbPageRange -= PAGE_SIZE;
+        }
+    }
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Callback handler for RTAvloGCPhysDestroy 
+ *
+ * @returns 0 to continue, otherwise stop
+ * @param   pBaseNode       Node to destroy
+ * @param   pvUser          User parameter
+ */
+static DECLCALLBACK(int) ftmR3PageTreeDestroyCallback(PAVLOGCPHYSNODECORE pBaseNode, void *pvUser)
+{
+    PVM pVM = (PVM)pvUser;
+    PFTMPHYSPAGETREENODE pNode = (PFTMPHYSPAGETREENODE)pBaseNode;
+
+    if (pVM)    /* NULL when the VM is destroyed. */
+    {
+        /* Update the guest memory of the standby VM. */
+        int rc = PGMR3PhysWriteExternal(pVM, pNode->Core.Key, pNode->pPage, PAGE_SIZE, "FTMemSync");
+        AssertRC(rc);
+    }
+    RTMemFree(pNode);
+    return 0;
+}
+
+
+/**
  * Listen for incoming traffic destined for the standby VM.
  *
@@ -881 +977 @@
                 continue;
 
-            while (true)
-            {
-                FTMTCPHDRMEM Hdr;
-                void *pPage;
-
-                /* Read memory header. */
-                rc = RTTcpRead(pVM->ftm.s.hSocket, &Hdr, sizeof(Hdr), NULL);
-                if (RT_FAILURE(rc))
-                {
-                    Log(("RTTcpRead failed with %Rrc\n", rc));
-                    break;
-                }
-                pVM->ftm.s.StatReceivedMem.c += sizeof(Hdr);
-
-                if (Hdr.cb == 0)
-                    break;  /* end of sync. */
-
-                Assert(Hdr.cb == Hdr.cbPageRange);  /** @todo uncompress */
-
-                /* Allocate memory to hold the page(s). */
-                pPage = RTMemAlloc(Hdr.cbPageRange);
-                AssertBreak(pPage);
-
-                /* Fetch the page(s). */
-                rc = RTTcpRead(pVM->ftm.s.hSocket, pPage, Hdr.cb, NULL);
-                if (RT_FAILURE(rc))
-                {
-                    Log(("RTTcpRead page data (%d bytes) failed with %Rrc\n", Hdr.cb, rc));
-                    break;
-                }
-                pVM->ftm.s.StatReceivedMem.c += Hdr.cb;
-
-                /* Update the guest memory of the standby VM. */
-#if 1
-                rc = PGMR3PhysWriteExternal(pVM, Hdr.GCPhys, pPage, Hdr.cbPageRange, "FTMemSync");
-#else
-                rc = PGMPhysWrite(pVM, Hdr.GCPhys, pPage, Hdr.cbPageRange);
-#endif
-                AssertRC(rc);
-
-                RTMemFree(pPage);
-            }
+            rc = ftmR3SyncMem(pVM);
+            AssertRC(rc);
 
             rc = ftmR3TcpWriteACK(pVM);
@@ -936 +992 @@
             if (RT_FAILURE(rc))
                 continue;
+
+            /* Flush all pending memory updates. */
+            if (pVM->ftm.s.standby.ppPhysPageTree)
+            {
+                RTAvloGCPhysDestroy(pVM->ftm.s.standby.ppPhysPageTree, ftmR3PageTreeDestroyCallback, pVM);
+                pVM->ftm.s.standby.ppPhysPageTree = NULL;
+            }
 
             RTSocketRetain(pVM->ftm.s.hSocket); /* For concurrent access by I/O thread and EMT. */

trunk/src/VBox/VMM/FTMInternal.h

@@ -24 +24 @@
 #include <VBox/stam.h>
 #include <VBox/pdmcritsect.h>
+#include <iprt/avl.h>
 
 /** @defgroup grp_ftm_int Internals.
@@ -30 +31 @@
  */
 
+/** Physical page tree node. */
+typedef struct FTMPHYSPAGETREENODE
+{
+    AVLOGCPHYSNODECORE  Core;
+    void               *pPage;
+} FTMPHYSPAGETREENODE;
+/** Pointer to FTMPHYSPAGETREENODE */
+typedef FTMPHYSPAGETREENODE *PFTMPHYSPAGETREENODE;
 
 /**
@@ -74 +83 @@
     {
         R3PTRTYPE(PRTTCPSERVER) hServer;
+        PPAVLOGCPHYSNODECORE    ppPhysPageTree;
     } standby;