Changeset 32643 in vbox

Timestamp:

Sep 20, 2010 2:30:38 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

66050

Message:

Additions/VBoxService: introduced --timesync-set-on-restore (defaults to 1) to force re-syncing the guest time with the host after the VM was restored

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp (modified) (10 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp

@@ -126 +126 @@
  * adjust it. This is used to implement --timesync-set-start.  */
 static bool volatile g_fTimeSyncSetNext = false;
+/** Whether to set the time when the VM was restored. */
+static bool g_fTimeSyncSetOnRestore = true;
 
 /** Current error count. Used to knowing when to bitch and when not to. */
@@ -132 +134 @@
 /** The semaphore we're blocking on. */
 static RTSEMEVENTMULTI g_TimeSyncEvent = NIL_RTSEMEVENTMULTI;
+
+/** The VM session ID. Changes whenever the VM is restored or reset. */
+static uint64_t g_idTimeSyncSession;
 
 #ifdef RT_OS_WINDOWS
@@ -202 +207 @@
             }
         }
+        if (   RT_SUCCESS(rc)
+            || rc == VERR_NOT_FOUND)
+        {
+            uint32_t value;
+            rc = VBoxServiceReadPropUInt32(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-on-restore",
+                                           &value, 1, 1);
+            if (RT_SUCCESS(rc))
+                g_fTimeSyncSetOnRestore = !!value;
+        }
 
         VbglR3GuestPropDisconnect(uGuestPropSvcClientID);
@@ -220 +234 @@
 {
     int rc = -1;
+    uint32_t value;
     if (ppszShort)
         /* no short options */;
@@ -242 +257 @@
         rc = VINF_SUCCESS;
     }
+    else if (!strcmp(argv[*pi], "----timesync-set-on-restore"))
+        rc = VBoxServiceArgUInt32(argc, argv, "", pi,
+                                  &value, 1, 1);
+    {
+        g_fTimeSyncSetOnRestore = !!value;
+    }
 
     return rc;
@@ -258 +279 @@
     if (!g_TimeSyncInterval)
         g_TimeSyncInterval = 10 * 1000;
+
+    VbglR3GetSessionId(&g_idTimeSyncSession);
+    /* The status code is ignored as this information is not available with VBox < 3.2.10. */
 
     int rc = RTSemEventMultiCreate(&g_TimeSyncEvent);
@@ -503 +527 @@
             {
                 /*
+                 * Set the time once after we were restored.
+                 * (Of course only if the drift is bigger than MinAdjust)
+                 */
+                uint32_t TimeSyncSetThreshold = g_TimeSyncSetThreshold;
+                if (g_fTimeSyncSetOnRestore)
+                {
+                    uint64_t idNewSession = g_idTimeSyncSession;
+                    VbglR3GetSessionId(&idNewSession);
+                    if (idNewSession != g_idTimeSyncSession)
+                    {
+                        VBoxServiceVerbose(3, "TimeSync: The VM session ID changed, forcing resync.\n");
+                        TimeSyncSetThreshold = 0;
+                        g_idTimeSyncSession  = idNewSession;
+                    }
+                }
+
+                /*
                  * Calculate the adjustment threshold and the current drift.
                  */
@@ -535 +576 @@
                      */
 
-                    if (    AbsDriftMilli > g_TimeSyncSetThreshold
+                    if (    AbsDriftMilli > TimeSyncSetThreshold
                         ||  g_fTimeSyncSetNext
                         ||  !VBoxServiceTimeSyncAdjust(&Drift))
@@ -627 +668 @@
     "              [--timesync-latency-factor <x>] [--timesync-max-latency <ms>]\n"
     "              [--timesync-set-threshold <ms>] [--timesync-set-start]"
+    "              [--timesync-set-restore 0|1]\n"
     ,
     /* pszOptions. */
@@ -645 +687 @@
     "                            adjust it. The default is 20 min.\n"
     "    --timesync-set-start    Set the time when starting the time sync service.\n"
+    "    --timesync-set-on-restore 0|1\n"
+    "                            Immediately set the time when the VM was restored.\n"
+    "                            1 = set (default), 0 = don't set.\n"
     ,
     /* methods */