Changeset 75559 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Nov 18, 2018 7:46:04 PM (6 years ago)

Author:

vboxsync

Message:

VBoxService: Always set the time on startup on OS/2.

File:

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

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

@@ -127 +127 @@
 static uint32_t         g_TimeSyncSetThreshold = 20*60*1000;
 /** Whether the next adjustment should just set the time instead of trying to
- * adjust it. This is used to implement --timesync-set-start.  */
-static bool volatile    g_fTimeSyncSetNext = false;
+ * adjust it. This is used to implement --timesync-set-start.
+ * For purposes of setting the kernel timezone, OS/2 always starts with this. */
+#ifdef RT_OS_OS2
+static bool volatile    g_fTimeSyncSetOnStart = true;
+#else
+static bool volatile    g_fTimeSyncSetOnStart = false;
+#endif
 /** Whether to set the time when the VM was restored. */
 static bool             g_fTimeSyncSetOnRestore = true;
@@ -209 +214 @@
             rc = VGSvcCheckPropExist(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-start");
             if (RT_SUCCESS(rc))
-                g_fTimeSyncSetNext = true;
+                g_fTimeSyncSetOnStart = true;
+        }
+        if (   RT_SUCCESS(rc)
+            || rc == VERR_NOT_FOUND)
+        {
+            rc = VGSvcCheckPropExist(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/VBoxService/--timesync-no-set-start");
+            if (RT_SUCCESS(rc))
+                g_fTimeSyncSetOnStart = false;
         }
         if (   RT_SUCCESS(rc)
@@ -286 +298 @@
         rc = VGSvcArgUInt32(argc, argv, "", pi, &g_TimeSyncSetThreshold, 0, 7*24*60*60*1000); /* a week */
     else if (!strcmp(argv[*pi], "--timesync-set-start"))
-        g_fTimeSyncSetNext = true;
+        g_fTimeSyncSetOnStart = true;
+    else if (!strcmp(argv[*pi], "--timesync-no-set-start"))
+        g_fTimeSyncSetOnStart = false;
     else if (!strcmp(argv[*pi], "--timesync-set-on-restore"))
         g_fTimeSyncSetOnRestore = true;
@@ -630 +644 @@
                 bool fSetTimeInThisLoop = false;
                 uint64_t AbsDriftMilli = RTTimeSpecGetMilli(&AbsDrift);
-                if (AbsDriftMilli > MinAdjust)
+                if (   AbsDriftMilli > MinAdjust
+                    || g_fTimeSyncSetOnStart)
                 {
                     /*
@@ -639 +654 @@
                      */
                     if (   AbsDriftMilli > TimeSyncSetThreshold
-                        || g_fTimeSyncSetNext
+                        || g_fTimeSyncSetOnStart
                         || !vgsvcTimeSyncAdjust(&Drift))
                     {
@@ -678 +693 @@
 
         /* Clear the set-next/set-start flag. */
-        g_fTimeSyncSetNext = false;
+        g_fTimeSyncSetOnStart = false;
 
         /*
@@ -755 +770 @@
     "              [--timesync-interval <ms>] [--timesync-min-adjust <ms>]\n"
     "              [--timesync-latency-factor <x>] [--timesync-max-latency <ms>]\n"
-    "              [--timesync-set-threshold <ms>] [--timesync-set-start]\n"
+    "              [--timesync-set-threshold <ms>]\n"
+    "              [--timesync-set-start|--timesync-no-set-start]\n"
     "              [--timesync-set-on-restore|--timesync-no-set-on-restore]\n"
     "              [--timesync-verbosity <level>]"
@@ -775 +791 @@
     "                            where to start setting the time instead of trying to\n"
     "                            adjust it. The default is 20 min.\n"
-    "    --timesync-set-start    Set the time when starting the time sync service.\n"
+    "    --timesync-set-start, --timesync-no-set-start    \n"
+    "                            Set the time when starting the time sync service.\n"
+#ifdef RT_OS_OS2
+    "                            Default: --timesync-set-start\n"
+#else
+    "                            Default: --timesync-no-set-start\n"
+#endif
     "    --timesync-set-on-restore, --timesync-no-set-on-restore\n"
     "                            Whether to immediately set the time when the VM is\n"