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

Timestamp:

Sep 23, 2014 10:25:34 AM (10 years ago)

Author:

vboxsync

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

96224

Message:

Runtime: Fix RTTimeMilliTS() on FreeBSD. Use macros for time units rather than hardcoded values.

Location:

trunk/src/VBox/Runtime/r3

Files:

• darwin/time-darwin.cpp (modified) (3 diffs)
• haiku/time-haiku.cpp (modified) (4 diffs)
• linux/time-linux.cpp (modified) (4 diffs)
• posix/time-posix.cpp (modified) (4 diffs)
• win/time-win.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/r3/darwin/time-darwin.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -89 +89 @@
     struct timeval tv;
     gettimeofday(&tv, NULL);
-    return (uint64_t)tv.tv_sec  * (uint64_t)(1000 * 1000 * 1000)
-         + (uint64_t)(tv.tv_usec * 1000);
+    return (uint64_t)tv.tv_sec  * RT_NS_1SEC_64
+         + (uint64_t)(tv.tv_usec * RT_NS_1US);
 }
 
@@ -102 +102 @@
 RTDECL(uint64_t) RTTimeSystemMilliTS(void)
 {
-    return rtTimeGetSystemNanoTS() / 1000000;
+    return rtTimeGetSystemNanoTS() / RT_NS_1MS;
 }
 

trunk/src/VBox/Runtime/r3/haiku/time-haiku.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -44 +44 @@
 DECLINLINE(uint64_t) rtTimeGetSystemNanoTS(void)
 {
-    return (uint64_t)system_time() * 1000;
+    return (uint64_t)system_time() * RT_NS_1US;
 }
 
@@ -72 +72 @@
 RTDECL(uint64_t) RTTimeSystemMilliTS(void)
 {
-    return rtTimeGetSystemNanoTS() / 1000000;
+    return rtTimeGetSystemNanoTS() / RT_NS_1MS;
 }
 
@@ -83 +83 @@
     return VINF_SUCCESS;
 }
+

trunk/src/VBox/Runtime/r3/linux/time-linux.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -119 +119 @@
         struct timespec ts;
         if (!mono_clock(&ts))
-            return (uint64_t)ts.tv_sec * (uint64_t)(1000 * 1000 * 1000)
+            return (uint64_t)ts.tv_sec * RT_NS_1SEC_64
                  + ts.tv_nsec;
         fMonoClock = false;
@@ -127 +127 @@
     struct timeval tv;
     gettimeofday(&tv, NULL);
-    return (uint64_t)tv.tv_sec  * (uint64_t)(1000 * 1000 * 1000)
-         + (uint64_t)(tv.tv_usec * 1000);
+    return (uint64_t)tv.tv_sec  * RT_NS_1SEC_64
+         + (uint64_t)(tv.tv_usec * RT_NS_1US);
 }
 
@@ -156 +156 @@
 RTDECL(uint64_t) RTTimeSystemMilliTS(void)
 {
-    return rtTimeGetSystemNanoTS() / 1000000;
+    return rtTimeGetSystemNanoTS() / RT_NS_1MS;
 }
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -47 +47 @@
         struct timespec ts;
         if (!clock_gettime(CLOCK_MONOTONIC, &ts))
-            return (uint64_t)ts.tv_sec * (uint64_t)(1000 * 1000 * 1000)
+            return (uint64_t)ts.tv_sec * RT_NS_1SEC_64
                  + ts.tv_nsec;
         s_fMonoClock = false;
@@ -56 +56 @@
     struct timeval tv;
     gettimeofday(&tv, NULL);
-    return (uint64_t)tv.tv_sec  * (uint64_t)(1000 * 1000 * 1000)
-         + (uint64_t)(tv.tv_usec * 1000);
+    return (uint64_t)tv.tv_sec  * RT_NS_1SEC_64
+         + (uint64_t)(tv.tv_usec * RT_NS_1US);
 }
 
@@ -85 +85 @@
 RTDECL(uint64_t) RTTimeSystemMilliTS(void)
 {
-    return rtTimeGetSystemNanoTS() / 1000000;
+    return rtTimeGetSystemNanoTS() / RT_NS_1MS;
 }
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -79 +79 @@
      * This would work if it didn't flip over every 49 (or so) days.
      */
-    return (uint64_t)GetTickCount() * (uint64_t)1000000;
+    return (uint64_t)GetTickCount() * RT_NS_1MS_64;
 
 #elif defined USE_PERFORMANCE_COUNTER
@@ -90 +90 @@
     {
         if (!QueryPerformanceFrequency(&llFreq))
-            return (uint64_t)GetTickCount() * (uint64_t)1000000;
+            return (uint64_t)GetTickCount() * RT_NS_1MS_64;
         llFreq.QuadPart /=    1000;
         uMult            = 1000000;     /* no math genius, but this seemed to help avoiding floating point. */
@@ -98 +98 @@
     if (QueryPerformanceCounter(&ll))
         return (ll.QuadPart * uMult) / llFreq.QuadPart;
-    return (uint64_t)GetTickCount() * (uint64_t)1000000;
+    return (uint64_t)GetTickCount() * RT_NS_1MS_64;
 
 #elif defined USE_FILE_TIME
@@ -149 +149 @@
 RTDECL(uint64_t) RTTimeSystemMilliTS(void)
 {
-    return rtTimeGetSystemNanoTS() / 1000000;
+    return rtTimeGetSystemNanoTS() / RT_NS_1MS;
 }
 
@@ -196 +196 @@
     Tzi.Bias = 0;
     if (GetTimeZoneInformation(&Tzi) != TIME_ZONE_ID_INVALID)
-        return -(int64_t)Tzi.Bias * 60*1000*1000*1000;
+        return -(int64_t)Tzi.Bias * 60 * RT_NS_1MS_64;
     return 0;
 }