Changeset 19084 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 21, 2009 3:13:05 PM (16 years ago)

Author:

vboxsync

Message:

VBoxService/common: First time synchronization code for Windows platforms.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService.cpp (modified) (1 diff)
• VBoxServiceTimeSync.cpp (modified) (6 diffs)

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

@@ -549 +549 @@
         rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */);
         if (RT_FAILURE(rc))
-            return VBoxServiceError("daemon failed: %Rrc\n", rc);
+            return VBoxServiceError("Daemon failed: %Rrc\n", rc);
         /* in-child */
 #endif

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

@@ -130 +130 @@
 static HANDLE g_hTokenProcess = NULL;
 /** Old token privileges. */
-static TOKEN_PRIVILEGES g_tkOldPrivileges;
+static TOKEN_PRIVILEGES g_TkOldPrivileges;
+/** Backup values for time adjustment. */
+static DWORD g_dwWinTimeAdjustment;
+static DWORD g_dwWinTimeIncrement;
+static BOOL g_bWinTimeAdjustmentDisabled;
 #endif
 
@@ -191 +195 @@
             if (LookupPrivilegeValue(NULL, SE_SYSTEMTIME_NAME, &tkPriv.Privileges[0].Luid))
             {
-                DWORD cbRet = sizeof(g_tkOldPrivileges);
-                if (!AdjustTokenPrivileges(g_hTokenProcess, FALSE, &tkPriv, sizeof(TOKEN_PRIVILEGES), &g_tkOldPrivileges, &cbRet))
+                DWORD cbRet = sizeof(g_TkOldPrivileges);
+                if (!AdjustTokenPrivileges(g_hTokenProcess, FALSE, &tkPriv, sizeof(TOKEN_PRIVILEGES), &g_TkOldPrivileges, &cbRet))
                 {
                     DWORD dwErr = GetLastError();
@@ -220 +224 @@
         }
     }
+
+    if (!::GetSystemTimeAdjustment(&g_dwWinTimeAdjustment, &g_dwWinTimeIncrement, &g_bWinTimeAdjustmentDisabled))
+    {
+        DWORD dwErr = GetLastError();
+        rc = RTErrConvertFromWin32(dwErr);
+        VBoxServiceError("Could not get time adjustment values! Last error: %ld!\n", dwErr);
+    }
+    else VBoxServiceVerbose(3, "Windows time adjustment: Initially %ld (100ns) units per %ld (100 ns) units interval, disabled=%d\n", 
+                            g_dwWinTimeAdjustment, g_dwWinTimeIncrement, g_bWinTimeAdjustmentDisabled ? 1 : 0);
 #endif /* RT_OS_WINDOWS */
 
@@ -289 +302 @@
                      */
 #ifdef RT_OS_WINDOWS
-                    /* Just make sure it compiles for now, but later:
-                     SetSystemTimeAdjustment and fall back on SetSystemTime.
-                     */
-                    //AssertFatalFailed();
+                    DWORD dwWinTimeAdjustment, dwWinNewTimeAdjustment, dwWinTimeIncrement;
+                    BOOL bWinTimeAdjustmentDisabled;
+                    if (!::GetSystemTimeAdjustment(&dwWinTimeAdjustment, &dwWinTimeIncrement, &bWinTimeAdjustmentDisabled))
+                    {
+                        VBoxServiceError("GetSystemTimeAdjustment failed, error=%ld\n", GetLastError());
+                    }
+                    else
+                    {
+                        DWORD dwDiffMax = g_dwWinTimeAdjustment * 0.50;
+                        DWORD dwDiffNew = dwWinTimeAdjustment * 0.10;
+
+                        if (RTTimeSpecGetMilli(&Drift) > 0)
+                        {
+                            dwWinNewTimeAdjustment = dwWinTimeAdjustment + dwDiffNew;
+                            if (dwWinNewTimeAdjustment > (g_dwWinTimeAdjustment + dwDiffMax))
+                            {    
+                                dwWinNewTimeAdjustment = g_dwWinTimeAdjustment + dwDiffMax;
+                                dwDiffNew = dwDiffMax;
+                            }
+                        }
+                        else 
+                        {
+                            dwWinNewTimeAdjustment = dwWinTimeAdjustment - dwDiffNew;
+                            if (dwWinNewTimeAdjustment < (g_dwWinTimeAdjustment - dwDiffMax))
+                            {    
+                                dwWinNewTimeAdjustment = g_dwWinTimeAdjustment - dwDiffMax;
+                                dwDiffNew = dwDiffMax;
+                            }
+                        }
+
+                        VBoxServiceVerbose(3, "Windows time adjustment: Drift=%ldms\n", RTTimeSpecGetMilli(&Drift));
+                        VBoxServiceVerbose(3, "Windows time adjustment: OrgTA=%ld, CurTA=%ld, NewTA=%ld, DiffNew=%ld, DiffMax=%ld\n", 
+                                           g_dwWinTimeAdjustment, dwWinTimeAdjustment, dwWinNewTimeAdjustment, dwDiffNew, dwDiffMax);
+                       
+                        if (!::SetSystemTimeAdjustment(dwWinNewTimeAdjustment, FALSE /* Periodic adjustments enabled. */))
+                        {    
+                            VBoxServiceError("SetSystemTimeAdjustment failed, error=%ld\n", GetLastError());       
+                        }
+                    }
+
 #else  /* !RT_OS_WINDOWS */
                     struct timeval tv;
@@ -331 +380 @@
 #endif /* !RT_OS_WINDOWS */
                 }
+                else
+                {
+#ifdef RT_OS_WINDOWS
+                    if (::SetSystemTimeAdjustment(0, TRUE /* Periodic adjustments disabled. */))
+                        VBoxServiceVerbose(3, "Windows Time Adjustment is now disabled.");
+#endif /* !RT_OS_WINDOWS */
+                }
                 break;
             }
@@ -378 +434 @@
     if (g_hTokenProcess)
     {
-        if (!AdjustTokenPrivileges(g_hTokenProcess, FALSE, &g_tkOldPrivileges, sizeof(TOKEN_PRIVILEGES), NULL, NULL))
+        if (!AdjustTokenPrivileges(g_hTokenProcess, FALSE, &g_TkOldPrivileges, sizeof(TOKEN_PRIVILEGES), NULL, NULL))
         {
             DWORD dwErr = GetLastError();