Changeset 72863 in vbox

Timestamp:

Jul 4, 2018 10:13:40 AM (7 years ago)

Author:

vboxsync

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

123408

Message:

IPRT: RTTimeProgramXxxx must all be derived from the nanosecond timestamp or we may get rounding errors. This happened when mixing the ring-0 formatted 'msprog' and 'timeprog' prefixes with ones from ring-3.

Location:

trunk/src/VBox/Runtime

Files:

• common/log/log.cpp (modified) (4 diffs)
• common/time/timeprog.cpp (modified) (3 diffs)
• gc/initterm-gc.cpp (modified) (2 diffs)
• include/internal/time.h (modified) (1 diff)
• r3/init.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -60 +60 @@
 # include <iprt/alloca.h>
 # include <stdio.h>
-# include "internal/time.h" /* For g_u64ProgramStartNanoTS. */
 #endif
 
@@ -1336 +1335 @@
     else
         pInt->pacEntriesPerGroup= NULL;
-    pInt->nsR0ProgramStart      = g_u64ProgramStartNanoTS;
+    pInt->nsR0ProgramStart      = RTTimeProgramStartNanoTS();
     RT_ZERO(pInt->szR0ThreadName);
     if (cchThreadName)
@@ -3711 +3710 @@
                     uint64_t u64 = RTTimeProgramMilliTS();
 #else
-                    uint64_t u64 = (RTTimeNanoTS() - pLogger->pInt->nsR0ProgramStart) / 1000000;
+                    uint64_t u64 = (RTTimeNanoTS() - pLogger->pInt->nsR0ProgramStart) / RT_NS_1MS;
 #endif
                     /* 1E8 milliseconds = 27 hours */
@@ -3746 +3745 @@
                     uint64_t u64 = RTTimeProgramMicroTS();
 #else
-                    uint64_t u64 = (RTTimeNanoTS() - pLogger->pInt->nsR0ProgramStart) / 1000;
+                    uint64_t u64 = (RTTimeNanoTS() - pLogger->pInt->nsR0ProgramStart) / RT_NS_1US;
 
 #endif

trunk/src/VBox/Runtime/common/time/timeprog.cpp

@@ -56 +56 @@
 RTDECL(uint64_t)  RTTimeProgramMicroTS(void)
 {
-    return RTTimeProgramNanoTS() / 1000;
+    return RTTimeProgramNanoTS() / RT_NS_1US;
 }
 RT_EXPORT_SYMBOL(RTTimeProgramMicroTS);
@@ -68 +68 @@
 RTDECL(uint64_t)  RTTimeProgramMilliTS(void)
 {
-    return RTTimeMilliTS() - g_u64ProgramStartMilliTS;
+    return RTTimeProgramNanoTS() / RT_NS_1MS;
 }
 RT_EXPORT_SYMBOL(RTTimeProgramMilliTS);
@@ -80 +80 @@
 RTDECL(uint32_t)  RTTimeProgramSecTS(void)
 {
-    AssertMsg(g_u64ProgramStartMilliTS, ("rtR3Init hasn't been called!\n"));
-    return (uint32_t)(RTTimeProgramMilliTS() / 1000);
+    return (uint32_t)(RTTimeProgramNanoTS() / RT_NS_1SEC);
 }
 RT_EXPORT_SYMBOL(RTTimeProgramSecTS);

trunk/src/VBox/Runtime/gc/initterm-gc.cpp

@@ -48 +48 @@
 uint64_t    g_u64ProgramStartNanoTS;
 
-/**
- * Program start microsecond TS.
- */
-uint64_t    g_u64ProgramStartMicroTS;
-
-/**
- * Program start millisecond TS.
- */
-uint64_t    g_u64ProgramStartMilliTS;
-
 
 /**
@@ -72 +62 @@
      */
     g_u64ProgramStartNanoTS = u64ProgramStartNanoTS;
-    g_u64ProgramStartMicroTS = u64ProgramStartNanoTS / 1000;
-    g_u64ProgramStartMilliTS = u64ProgramStartNanoTS / 1000000;
 
     LogFlow(("RTGCInit: returns VINF_SUCCESS\n"));

trunk/src/VBox/Runtime/include/internal/time.h

@@ -35 +35 @@
 
 extern DECLHIDDEN(uint64_t) g_u64ProgramStartNanoTS;
-extern DECLHIDDEN(uint64_t) g_u64ProgramStartMicroTS;
-extern DECLHIDDEN(uint64_t) g_u64ProgramStartMilliTS;
 
 #endif

trunk/src/VBox/Runtime/r3/init.cpp

@@ -107 +107 @@
  */
 DECLHIDDEN(uint64_t)        g_u64ProgramStartNanoTS;
-
-/**
- * Program start microsecond TS.
- */
-DECLHIDDEN(uint64_t)        g_u64ProgramStartMicroTS;
-
-/**
- * Program start millisecond TS.
- */
-DECLHIDDEN(uint64_t)        g_u64ProgramStartMilliTS;
 
 /**
@@ -470 +460 @@
 
     /*
-     * Init the program start TSes.
+     * Init the program start timestamp TS.
      * Do that here to be sure that the GIP time was properly updated the 1st time.
      */
     g_u64ProgramStartNanoTS = RTTimeNanoTS();
-    g_u64ProgramStartMicroTS = g_u64ProgramStartNanoTS / 1000;
-    g_u64ProgramStartMilliTS = g_u64ProgramStartNanoTS / 1000000;
 
     /*