Changeset 31782 in vbox

Timestamp:

Aug 19, 2010 11:18:51 AM (14 years ago)

Author:

vboxsync

Message:

FT updates

Location:

trunk

Files:

• include/VBox/vm.h (modified) (2 diffs)
• src/VBox/VMM/FTM.cpp (modified) (8 diffs)
• src/VBox/VMM/FTMInternal.h (modified) (4 diffs)

trunk/include/VBox/vm.h

@@ -968 +968 @@
         struct FTM  s;
 #endif
-        uint8_t     padding[128];        /* multiple of 64 */
+        uint8_t     padding[512];        /* multiple of 64 */
     } ftm;
 
@@ -1001 +1001 @@
 
     /** Padding for aligning the cpu array on a page boundrary. */
-    uint8_t         abAlignment2[1886];
+    uint8_t         abAlignment2[1502];
 
     /* ---- end small stuff ---- */

trunk/src/VBox/VMM/FTM.cpp

@@ -48 +48 @@
 VMMR3DECL(int) FTMR3Init(PVM pVM)
 {
+    /*
+     * Assert alignment and sizes.
+     */
+    AssertCompile(sizeof(pVM->ftm.s) <= sizeof(pVM->ftm.padding));
+    AssertCompileMemberAlignment(FTM, CritSect, sizeof(uintptr_t));
+
     /** @todo saved state for master nodes! */
     pVM->ftm.s.pszAddress               = NULL;
@@ -56 +62 @@
     pVM->ftm.s.master.hShutdownEvent    = NIL_RTSEMEVENT;
     pVM->ftm.s.hSocket                  = NIL_RTSOCKET;
+
+    /*
+     * Initialize the PGM critical section.
+     */
+    int rc = PDMR3CritSectInit(pVM, &pVM->ftm.s.CritSect, RT_SRC_POS, "FTM");
+    AssertRCReturn(rc, rc);
+
+    STAM_REL_REG(pVM, &pVM->ftm.s.StatReceivedMem,               STAMTYPE_COUNTER, "/FT/Received/Mem",                   STAMUNIT_BYTES, "The amount of memory pages that was received.");
+    STAM_REL_REG(pVM, &pVM->ftm.s.StatReceivedState,             STAMTYPE_COUNTER, "/FT/Received/State",                 STAMUNIT_BYTES, "The amount of state information that was received.");
+    STAM_REL_REG(pVM, &pVM->ftm.s.StatSentMem,                   STAMTYPE_COUNTER, "/FT/Sent/Mem",                       STAMUNIT_BYTES, "The amount of memory pages that was sent.");
+    STAM_REL_REG(pVM, &pVM->ftm.s.StatSentState,                 STAMTYPE_COUNTER, "/FT/Sent/State",                     STAMUNIT_BYTES, "The amount of state information that was sent.");
+
     return VINF_SUCCESS;
 }
@@ -81 +99 @@
         RTSemEventDestroy(pVM->ftm.s.master.hShutdownEvent);
 
+    PDMR3CritSectDelete(&pVM->ftm.s.CritSect);
     return VINF_SUCCESS;
 }
@@ -252 +271 @@
                     rc = ftmR3TcpReadACK(pVM, "password", "Invalid password");
                     if (RT_SUCCESS(rc))
+                    {
+                        /** todo: verify VM config. */
                         break;
+                    }
                 }
             }
@@ -268 +290 @@
      */
 
+    for (;;)
+    {
+        rc = RTSemEventWait(pVM->ftm.s.master.hShutdownEvent, pVM->ftm.s.uInterval);
+        if (rc != VERR_TIMEOUT)
+            break;    /* told to quit */            
+    }
     return rc;
 }
@@ -323 +351 @@
         return VINF_SUCCESS;
 
+    /** todo: verify VM config. */
+
     /*
      * Stop the server.
@@ -386 +416 @@
     AssertReturn(pszAddress, VERR_INVALID_PARAMETER);
 
-    pVM->ftm.s.uInterval   = uInterval;
-    pVM->ftm.s.uPort       = uPort;
-    pVM->ftm.s.pszAddress  = RTStrDup(pszAddress);
+    if (pVM->ftm.s.uInterval)
+        pVM->ftm.s.uInterval    = uInterval;
+    else
+        pVM->ftm.s.uInterval    = 50;   /* standard sync interval of 50ms */
+
+    pVM->ftm.s.uPort            = uPort;
+    pVM->ftm.s.pszAddress       = RTStrDup(pszAddress);
     if (pszPassword)
-        pVM->ftm.s.pszPassword = RTStrDup(pszPassword);
+        pVM->ftm.s.pszPassword  = RTStrDup(pszPassword);
     if (fMaster)
     {
@@ -436 +470 @@
     return RTTcpServerShutdown(pVM->ftm.s.standby.hServer);
 }
+
+
+/**
+ * Initiates a checkpoint update on the master node
+ *
+ * @returns VBox status code.
+ *
+ * @param   pVM         The VM to power on.
+ */
+VMMR3DECL(int) FTMR3Checkpoint(PVM pVM)
+{
+    if (!pVM->fFaultTolerantMaster)
+        return VINF_SUCCESS;
+
+    return VERR_NOT_IMPLEMENTED;
+}

trunk/src/VBox/VMM/FTMInternal.h

@@ -22 +22 @@
 #include <VBox/types.h>
 #include <VBox/ftm.h>
+#include <VBox/stam.h>
+#include <VBox/pdmcritsect.h>
 #include <iprt/tcp.h>
 #include <iprt/semaphore.h>
@@ -39 +41 @@
     /** Address of the standby VM. */
     char               *pszAddress;
+    /** Password to access the syncing server of the standby VM. */
+    char               *pszPassword;
     /** Port of the standby VM. */
     unsigned            uPort;
-    /** Password to access the syncing server of the standby VM. */
-    char               *pszPassword;
     /** Syncing interval in ms. */
     unsigned            uInterval;
@@ -48 +50 @@
     /** Set when this VM is the standby FT node. */
     bool                fIsStandbyNode;
+    bool                fAlignment[7];
 
     /** Current active socket. */
@@ -62 +65 @@
     } master;
 
+    /** FTm critical section.
+     * This makes sure only the checkpoint or sync is active
+     */
+    PDMCRITSECT         CritSect;
+
+    STAMCOUNTER         StatReceivedMem;
+    STAMCOUNTER         StatReceivedState;
+    STAMCOUNTER         StatSentMem;
+    STAMCOUNTER         StatSentState;
 } FTM;