Changeset 26113 in vbox

Timestamp:

Feb 1, 2010 11:04:57 AM (15 years ago)

Author:

vboxsync

Message:

VBoxService/timesync: Get more accurate current time on Windows when doing a hard sync.

File:

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

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

@@ -434 +434 @@
  *
  * @param   pDrift              The time adjustment.
- * @param   pHostNow            The host time at the time of the host query.
- *                              REMOVE THIS ARGUMENT!
- */
-static void VBoxServiceTimeSyncSet(PCRTTIMESPEC pDrift, PCRTTIMESPEC pHostNow)
+ */
+static void VBoxServiceTimeSyncSet(PCRTTIMESPEC pDrift)
 {
     /*
@@ -443 +441 @@
      */
 #ifdef RT_OS_WINDOWS
-/** @todo r=bird: Get current time and add the adjustment, the host time is
- *                stale by now. */
-    FILETIME ft;
-    RTTimeSpecGetNtFileTime(pHostNow, &ft);
-    SYSTEMTIME st;
-    if (FileTimeToSystemTime(&ft, &st))
-    {
-        if (!SetSystemTime(&st))
-            VBoxServiceError("SetSystemTime failed, error=%u\n", GetLastError());
+    RTTIMESPEC hostNow;
+    int rc = VbglR3GetHostTime(&hostNow);
+    if (RT_FAILURE(rc))
+    {
+        if (g_cTimeSyncErrors++ < 10)
+            VBoxServiceError("VbglR3GetHostTime failed; rc=%Rrc\n", rc);
     }
     else
-        VBoxServiceError("Cannot convert system times, error=%u\n", GetLastError());
-
+    {
+        FILETIME ft;
+        RTTimeSpecGetNtFileTime(&hostNow, &ft);
+        SYSTEMTIME st;
+        if (FileTimeToSystemTime(&ft, &st))
+        {
+            if (!SetSystemTime(&st))
+                VBoxServiceError("SetSystemTime failed, error=%u\n", GetLastError());
+        }
+        else
+            VBoxServiceError("Cannot convert system times, error=%u\n", GetLastError());
+    }
 #else  /* !RT_OS_WINDOWS */
     struct timeval tv;
@@ -564 +569 @@
                     {
                         VBoxServiceTimeSyncCancelAdjust();
-                        VBoxServiceTimeSyncSet(&Drift, &HostNow);
+                        VBoxServiceTimeSyncSet(&Drift);
                     }
                 }