Changeset 31753 in vbox

Timestamp:

Aug 18, 2010 11:30:02 AM (14 years ago)

Author:

vboxsync

Message:

FT updates

Location:

trunk

Files:

• include/VBox/ftm.h (modified) (1 diff, 2 props)
• src/VBox/VMM/FTM.cpp (modified) (5 diffs, 2 props)
• src/VBox/VMM/FTMInternal.h (modified) (2 diffs, 2 props)

trunk/include/VBox/ftm.h

@@ -44 +44 @@
 VMMR3DECL(int) FTMR3Init(PVM pVM);
 VMMR3DECL(int) FTMR3Term(PVM pVM);
+VMMR3DECL(int) FTMR3StandbyCancel(PVM pVM);
 
 #endif /* IN_RING3 */

trunk/src/VBox/VMM/FTM.cpp

@@ -44 +44 @@
 {
     /** @todo saved state for master nodes! */
-    pVM->ftm.s.pszAddress     = NULL;
-    pVM->ftm.s.pszPassword    = NULL;
-    pVM->fFaultTolerantMaster = false;
+    pVM->ftm.s.pszAddress       = NULL;
+    pVM->ftm.s.pszPassword      = NULL;
+    pVM->fFaultTolerantMaster   = false;
+    pVM->ftm.s.fIsStandbyNode   = false;
+    pVM->ftm.s.standby.hServer  = NULL;
     return VINF_SUCCESS;
 }
@@ -65 +67 @@
     if (pVM->ftm.s.pszPassword)
         RTMemFree(pVM->ftm.s.pszPassword);
+    if (pVM->ftm.s.standby.hServer)
+        RTTcpServerDestroy(pVM->ftm.s.standby.hServer);
 
     return VINF_SUCCESS;
@@ -111 +115 @@
  * @param   fMaster     FT master or standby
  * @param   uInterval   FT sync interval
- * @param   pszAddress  Master VM address
- * @param   uPort       Master VM port
- * @param   pszPassword FT password
+ * @param   pszAddress  Standby VM address
+ * @param   uPort       Standby VM port
+ * @param   pszPassword FT password (NULL for none)
  *
  * @thread      Any thread.
@@ -121 +125 @@
 VMMR3DECL(int) FTMR3PowerOn(PVM pVM, bool fMaster, unsigned uInterval, const char *pszAddress, unsigned uPort, const char *pszPassword)
 {
-    int rc;
+    int rc = VINF_SUCCESS;
 
     VMSTATE enmVMState = VMR3GetState(pVM);
@@ -147 +151 @@
     {
         /* standby */
-        PRTTCPSERVER hServer;
-
-        rc = RTTcpServerCreateEx(pszAddress, uPort, &hServer);
+        rc = RTTcpServerCreateEx(pszAddress, uPort, &pVM->ftm.s.standby.hServer);
         if (RT_FAILURE(rc))
             return rc;
+        pVM->ftm.s.fIsStandbyNode = true;
 
-        rc = RTTcpServerListen(hServer, ftmR3StandbyServeConnection, pVM);
+        rc = RTTcpServerListen(pVM->ftm.s.standby.hServer, ftmR3StandbyServeConnection, pVM);
         /** @todo deal with the exit code to check if we should activate this standby VM. */
 
-        RTTcpServerDestroy(hServer);
+        RTTcpServerDestroy(pVM->ftm.s.standby.hServer);
+        pVM->ftm.s.standby.hServer = NULL;
     }
-    return VERR_NOT_IMPLEMENTED;
+    return rc;
 }
 
+/**
+ * Powers off the fault tolerant virtual machine (standby).
+ *
+ * @returns VBox status code.
+ *
+ * @param   pVM         The VM to power on.
+ */
+VMMR3DECL(int) FTMR3StandbyCancel(PVM pVM)
+{
+    AssertReturn(!pVM->fFaultTolerantMaster, VERR_NOT_SUPPORTED);
+    Assert(pVM->ftm.s.standby.hServer);
+
+    return RTTcpServerShutdown(pVM->ftm.s.standby.hServer);
+}

trunk/src/VBox/VMM/FTMInternal.h

@@ -22 +22 @@
 #include <VBox/types.h>
 #include <VBox/ftm.h>
+#include <iprt/tcp.h>
 
 
@@ -36 +37 @@
 typedef struct FTM
 {
-    char       *pszAddress;
-    char       *pszPassword;
-    unsigned    uPort;
-    unsigned    uInterval;
+    /** Address of the standby VM. */
+    char               *pszAddress;
+    /** 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;
+
+    /** Set when this VM is the standby FT node. */
+    bool                fIsStandbyNode;
+
+    struct
+    {
+        PRTTCPSERVER    hServer;
+    } standby;
 
 } FTM;