Changeset 72285 in vbox

Timestamp:

May 22, 2018 12:35:20 PM (7 years ago)

Author:

vboxsync

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

122734

Message:

IPRT: Adding RTTimeLocalDeltaNanoFor.

Location:

trunk

Files:

• include/iprt/mangling.h (modified) (1 diff)
• include/iprt/time.h (modified) (2 diffs)
• src/VBox/Runtime/generic/RTTimeLocalDeltaNanoFor-generic.cpp (added)
• src/VBox/Runtime/r3/posix/timelocal-posix.cpp (modified) (2 diffs)
• src/VBox/Runtime/r3/win/time2-win.cpp (modified) (1 diff)

trunk/include/iprt/mangling.h

@@ -2264 +2264 @@
 # define RTTimeIsLeapYear                               RT_MANGLER(RTTimeIsLeapYear)
 # define RTTimeLocalDeltaNano                           RT_MANGLER(RTTimeLocalDeltaNano)
+# define RTTimeLocalDeltaNanoFor                        RT_MANGLER(RTTimeLocalDeltaNanoFor)
 # define RTTimeLocalExplode                             RT_MANGLER(RTTimeLocalExplode)
 # define RTTimeLocalNormalize                           RT_MANGLER(RTTimeLocalNormalize)

trunk/include/iprt/time.h

@@ -723 +723 @@
 
 /**
- * Gets the delta between UTC and local time.
+ * Gets the current delta between UTC and local time.
  *
  * @code
@@ -733 +733 @@
  */
 RTDECL(int64_t) RTTimeLocalDeltaNano(void);
+
+/**
+ * Gets the delta between UTC and local time at the given time.
+ *
+ * @code
+ *      RTTIMESPEC LocalTime;
+ *      RTTimeNow(&LocalTime);
+ *      RTTimeSpecAddNano(&LocalTime, RTTimeLocalDeltaNanoFor(&LocalTime));
+ * @endcode
+ *
+ * @param   pTimeSpec   The time spec giving the time to get the delta for.
+ * @returns Returns the nanosecond delta between UTC and local time.
+ */
+RTDECL(int64_t) RTTimeLocalDeltaNanoFor(PCRTTIMESPEC pTimeSpec);
 
 /**

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

@@ -148 +148 @@
 
 /**
- * Gets the delta between UTC and local time.
+ * Gets the current delta between UTC and local time.
  *
  * @code
@@ -161 +161 @@
     RTTIMESPEC Time;
     return rtTimeLocalUTCOffset(RTTimeNow(&Time), true /* current time, skip fallback */);
+}
+
+
+/**
+ * Gets the delta between UTC and local time at the given time.
+ *
+ * @code
+ *      RTTIMESPEC LocalTime;
+ *      RTTimeNow(&LocalTime);
+ *      RTTimeSpecAddNano(&LocalTime, RTTimeLocalDeltaNanoFor(&LocalTime));
+ * @endcode
+ *
+ * @param   pTimeSpec   The time spec giving the time to get the delta for.
+ * @returns Returns the nanosecond delta between UTC and local time.
+ */
+RTDECL(int64_t) RTTimeLocalDeltaNanoFor(PCRTTIMESPEC pTimeSpec)
+{
+    AssertPtr(pTimeSpec);
+    return rtTimeLocalUTCOffset(pTimeSpec, false /* current time, skip fallback */);
 }
 

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

@@ -107 +107 @@
 }
 
+
+/**
+ * Gets the delta between UTC and local time at the given time.
+ *
+ * @code
+ *      RTTIMESPEC LocalTime;
+ *      RTTimeNow(&LocalTime);
+ *      RTTimeSpecAddNano(&LocalTime, RTTimeLocalDeltaNanoFor(&LocalTime));
+ * @endcode
+ *
+ * @param   pTimeSpec   The time spec giving the time to get the delta for.
+ * @returns Returns the nanosecond delta between UTC and local time.
+ */
+RTDECL(int64_t) RTTimeLocalDeltaNanoFor(PCRTTIMESPEC pTimeSpec)
+{
+    RTTIMESPEC LocalTime;
+    if (g_pfnSystemTimeToTzSpecificLocalTime)
+    {
+        /*
+         * FileTimeToLocalFileTime does not do the right thing, so we'll have
+         * to convert to system time and SystemTimeToTzSpecificLocalTime instead.
+         *
+         * Note! FileTimeToSystemTime drops resoultion down to milliseconds, thus
+         *       we have to do the offUTC calculation using milliseconds and adjust
+         *       u32Nanosecons by sub milliseconds digits.
+         */
+        SYSTEMTIME SystemTimeIn;
+        FILETIME FileTime;
+        if (FileTimeToSystemTime(RTTimeSpecGetNtFileTime(pTimeSpec, &FileTime), &SystemTimeIn))
+        {
+            SYSTEMTIME SystemTimeOut;
+            if (g_pfnSystemTimeToTzSpecificLocalTime(NULL /* use current TZI */, &SystemTimeIn, &SystemTimeOut))
+            {
+                if (SystemTimeToFileTime(&SystemTimeOut, &FileTime))
+                {
+                    RTTimeSpecSetNtFileTime(&LocalTime, &FileTime);
+
+                    return (RTTimeSpecGetMilli(&LocalTime) - RTTimeSpecGetMilli(pTimeSpec)) * RT_NS_1MS;
+                }
+            }
+        }
+    }
+
+    return RTTimeLocalDeltaNano();
+}
+