Changeset 32085 in vbox for trunk/src

Timestamp:

Aug 30, 2010 11:41:20 AM (14 years ago)

Author:

vboxsync

Message:

FT fixes

File:

• trunk/src/VBox/VMM/FTM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/FTM.cpp

@@ -136 +136 @@
 VMMR3DECL(int) FTMR3Term(PVM pVM)
 {
+    if (pVM->ftm.s.master.hShutdownEvent != NIL_RTSEMEVENT)
+        RTSemEventDestroy(pVM->ftm.s.master.hShutdownEvent);
+    if (pVM->ftm.s.hSocket != NIL_RTSOCKET)
+        RTTcpClientClose(pVM->ftm.s.hSocket);
+    if (pVM->ftm.s.standby.hServer)
+        RTTcpServerDestroy(pVM->ftm.s.standby.hServer);
     if (pVM->ftm.s.pszAddress)
         RTMemFree(pVM->ftm.s.pszAddress);
     if (pVM->ftm.s.pszPassword)
         RTMemFree(pVM->ftm.s.pszPassword);
-    if (pVM->ftm.s.hSocket != NIL_RTSOCKET)
-        RTTcpClientClose(pVM->ftm.s.hSocket);
-    if (pVM->ftm.s.standby.hServer)
-        RTTcpServerDestroy(pVM->ftm.s.standby.hServer);
-    if (pVM->ftm.s.master.hShutdownEvent != NIL_RTSEMEVENT)
-        RTSemEventDestroy(pVM->ftm.s.master.hShutdownEvent);
 
     PDMR3CritSectDelete(&pVM->ftm.s.CritSect);
@@ -660 +660 @@
          * Try connect to the standby machine.
          */
+        Log(("ftmR3MasterThread: client connect to %s %d\n", pVM->ftm.s.pszAddress, pVM->ftm.s.uPort));
         rc = RTTcpClientConnect(pVM->ftm.s.pszAddress, pVM->ftm.s.uPort, &pVM->ftm.s.hSocket);
         if (RT_SUCCESS(rc))
         {
+            Log(("ftmR3MasterThread: CONNECTED\n"));
+
             /* Disable Nagle. */
             rc = RTTcpSetSendCoalescing(pVM->ftm.s.hSocket, false /*fEnable*/);