Changeset 72140 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

May 7, 2018 2:21:31 PM (7 years ago)

Author:

vboxsync

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

122537

Message:

IPRT/time: misc fixes (incorrect offUTC conversion sign, forgotten storing of offUTC, incorrect month/day calculation for first day of month, avoiding assertions when leap year needs to be recalulated) for local time, make RTTimeImplode process local time correctly, plus an implementation of RTTimeLocalNormalize and RTTimeConvertToZulu. Much improved testcase exercising overflow handling in the local time case.

Location:

trunk/src/VBox/Runtime/r3

Files:

• posix/timelocal-posix.cpp (modified) (3 diffs)
• win/time2-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/posix/timelocal-posix.cpp

@@ -64 +64 @@
 
     /*
-     * Explode it as both local and uct time.
+     * Explode it as both local and UTC time.
      */
     struct tm TmLocal;
@@ -95 +95 @@
          * Must add 24 hours to the value that is ahead of the other.
          *
-         * To determin which is ahead was busted for a long long time (bugref:9078),
+         * To determine which is ahead was busted for a long long time (bugref:9078),
          * so here are some examples and two different approaches.
          *
@@ -174 +174 @@
 {
     RTTIMESPEC LocalTime = *pTimeSpec;
-    RTTimeSpecAddNano(&LocalTime, rtTimeLocalUTCOffset(&LocalTime, true /* current time, skip fallback */));
+    int64_t LocalUTCOffset = rtTimeLocalUTCOffset(&LocalTime, true /* current time, skip fallback */);
+    RTTimeSpecAddNano(&LocalTime, LocalUTCOffset);
     pTime = RTTimeExplode(pTime, &LocalTime);
     if (pTime)
+    {
         pTime->fFlags = (pTime->fFlags & ~RTTIME_FLAGS_TYPE_MASK) | RTTIME_FLAGS_TYPE_LOCAL;
+        pTime->offUTC = LocalUTCOffset / RT_NS_1MIN;
+    }
     return pTime;
 }

trunk/src/VBox/Runtime/r3/win/time2-win.cpp

@@ -76 +76 @@
                     pTime = RTTimeExplode(pTime, &LocalTime);
                     if (pTime)
+                    {
                         pTime->fFlags = (pTime->fFlags & ~RTTIME_FLAGS_TYPE_MASK) | RTTIME_FLAGS_TYPE_LOCAL;
+                        pTime->offUTC = (LocalTime - *pTimeSpec) / RT_NS_1MIN;
+                    }
                     return pTime;
                 }
@@ -88 +91 @@
      */
     LocalTime = *pTimeSpec;
-    RTTimeSpecAddNano(&LocalTime, RTTimeLocalDeltaNano());
+    int64_t LocalUTCOffset = RTTimeLocalDeltaNano();
+    RTTimeSpecAddNano(&LocalTime, LocalUTCOffset);
     pTime = RTTimeExplode(pTime, &LocalTime);
     if (pTime)
+    {
         pTime->fFlags = (pTime->fFlags & ~RTTIME_FLAGS_TYPE_MASK) | RTTIME_FLAGS_TYPE_LOCAL;
+        pTime->offUTC = LocalUTCOffset / RT_NS_1MIN;
+    }
     return pTime;
 }