Changeset 21157 in vbox for trunk

Timestamp:

Jul 2, 2009 12:58:57 PM (16 years ago)

Author:

vboxsync

Message:

VBoxServiceTimeSync.cpp: r=bird: Some todos for the windows code.

File:

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

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

@@ -198 +198 @@
             {
                 DWORD cbRet = sizeof(g_TkOldPrivileges);
-                if (!AdjustTokenPrivileges(g_hTokenProcess, FALSE, &tkPriv, sizeof(TOKEN_PRIVILEGES), &g_TkOldPrivileges, &cbRet))
+                if (AdjustTokenPrivileges(g_hTokenProcess, FALSE, &tkPriv, sizeof(TOKEN_PRIVILEGES), &g_TkOldPrivileges, &cbRet))
+                    rc = VINF_SUCCESS;
+                else
                 {
                     DWORD dwErr = GetLastError();
@@ -211 +213 @@
                 VBoxServiceError("Looking up token privileges (SE_SYSTEMTIME_NAME) failed with status code %u/%Rrc!\n", dwErr, rc);
             }
-
             if (RT_FAILURE(rc))
             {
@@ -227 +228 @@
     }
 
-    if (!::GetSystemTimeAdjustment(&g_dwWinTimeAdjustment, &g_dwWinTimeIncrement, &g_bWinTimeAdjustmentDisabled))
+    if (GetSystemTimeAdjustment(&g_dwWinTimeAdjustment, &g_dwWinTimeIncrement, &g_bWinTimeAdjustmentDisabled))
+        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);
+    else
     {
         DWORD dwErr = GetLastError();
@@ -233 +237 @@
         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 */
 
@@ -249 +251 @@
 
     /*
-     * Tell the control thread that it can continue
-     * spawning services.
+     * Tell the control thread that it can continue spawning services.
      */
     RTThreadUserSignal(RTThreadSelf());
 
+    /*
+     * The Work Loop.
+     */
     unsigned cErrors = 0;
     for (;;)
@@ -303 +307 @@
                 }
 
+/** @todo move the adjustment code into two new functions, too much code
+ *        here. */
                 uint32_t AbsDriftMilli = RTTimeSpecGetMilli(&AbsDrift);
                 if (AbsDriftMilli > MinAdjust)
@@ -313 +319 @@
 #ifdef RT_OS_WINDOWS
                     DWORD dwWinTimeAdjustment, dwWinNewTimeAdjustment, dwWinTimeIncrement;
-                    BOOL bWinTimeAdjustmentDisabled;
-                    if (!::GetSystemTimeAdjustment(&dwWinTimeAdjustment, &dwWinTimeIncrement, &bWinTimeAdjustmentDisabled))
-                    {
-                        VBoxServiceError("GetSystemTimeAdjustment failed, error=%ld\n", GetLastError());
-                    }
-                    else
+                    BOOL  fWinTimeAdjustmentDisabled;
+/** @todo r=bird: NT4 doesn't have GetSystemTimeAdjustment. */
+                    if (GetSystemTimeAdjustment(&dwWinTimeAdjustment, &dwWinTimeIncrement, &fWinTimeAdjustmentDisabled))
                     {
                         DWORD dwDiffMax = g_dwWinTimeAdjustment * 0.50;
-                        DWORD dwDiffNew = dwWinTimeAdjustment * 0.10;
+                        DWORD dwDiffNew =   dwWinTimeAdjustment * 0.10;
 
                         if (RTTimeSpecGetMilli(&Drift) > 0)
@@ -327 +330 @@
                             dwWinNewTimeAdjustment = dwWinTimeAdjustment + dwDiffNew;
                             if (dwWinNewTimeAdjustment > (g_dwWinTimeAdjustment + dwDiffMax))
-                            {    
+                            {
                                 dwWinNewTimeAdjustment = g_dwWinTimeAdjustment + dwDiffMax;
                                 dwDiffNew = dwDiffMax;
                             }
                         }
-                        else 
+                        else
                         {
                             dwWinNewTimeAdjustment = dwWinTimeAdjustment - dwDiffNew;
                             if (dwWinNewTimeAdjustment < (g_dwWinTimeAdjustment - dwDiffMax))
-                            {    
+                            {
                                 dwWinNewTimeAdjustment = g_dwWinTimeAdjustment - dwDiffMax;
                                 dwDiffNew = dwDiffMax;
@@ -342 +345 @@
                         }
 
-                        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", 
+                        VBoxServiceVerbose(3, "Windows time adjustment: Drift=%lldms\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);
-                       
+
                         /* Is AbsDrift way too big? Then a minimum adjustment via SetSystemTimeAdjustment() would take ages.
                            So set the time in a hard manner. */
                         if (AbsDriftMilli > (60 * 1000 * 20)) /** @todo 20 minutes here hardcoded here. Needs configurable parameter later. */
                         {
-                            SYSTEMTIME st = {0};
-                            FILETIME ft = {0};
-
                             VBoxServiceVerbose(3, "Windows time adjustment: Setting system time directly.\n");
 
+
+/** @todo NT4 doesn't have GetSystemTimeAdjustment. */
+                            FILETIME ft;
                             RTTimeSpecGetNtFileTime(&HostNow, &ft);
-                            if (FALSE == FileTimeToSystemTime(&ft,&st))
-                                VBoxServiceError("Cannot convert system times, error=%ld\n", GetLastError());
-
-                            if (!::SetSystemTime(&st))
-                                VBoxServiceError("SetSystemTime failed, error=%ld\n", GetLastError());
+                            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
                         {
-                            if (!::SetSystemTimeAdjustment(dwWinNewTimeAdjustment, FALSE /* Periodic adjustments enabled. */))
-                                VBoxServiceError("SetSystemTimeAdjustment failed, error=%ld\n", GetLastError());       
+                            if (!SetSystemTimeAdjustment(dwWinNewTimeAdjustment, FALSE /* Periodic adjustments enabled. */))
+                                VBoxServiceError("SetSystemTimeAdjustment failed, error=%u\n", GetLastError());
                         }
                     }
+                    else
+                        VBoxServiceError("GetSystemTimeAdjustment failed, error=%ld\n", GetLastError());
 
 #else  /* !RT_OS_WINDOWS */
@@ -410 +418 @@
                 {
 #ifdef RT_OS_WINDOWS
-                    if (::SetSystemTimeAdjustment(0, TRUE /* Periodic adjustments disabled. */))
+                    if (SetSystemTimeAdjustment(0, TRUE /* Periodic adjustments disabled. */))
                         VBoxServiceVerbose(3, "Windows Time Adjustment is now disabled.\n");
 #endif /* !RT_OS_WINDOWS */