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

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Runtime/r0drv

Files:

• darwin/time-r0drv-darwin.cpp (modified) (4 diffs)
• freebsd/time-r0drv-freebsd.c (modified) (3 diffs)
• haiku/time-r0drv-haiku.c (modified) (4 diffs)
• linux/time-r0drv-linux.c (modified) (4 diffs)
• nt/time-r0drv-nt.cpp (modified) (3 diffs)
• solaris/time-r0drv-solaris.c (modified) (4 diffs)
• solaris/timer-r0drv-solaris.c (modified) (1 diff)

trunk/src/VBox/Runtime/r0drv/darwin/time-r0drv-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
@@ -68 +68 @@
 RTDECL(uint64_t) RTTimeMilliTS(void)
 {
-    return rtTimeGetSystemNanoTS() / 1000000;
+    return rtTimeGetSystemNanoTS() / RT_NS_1MS;
 }
 
@@ -80 +80 @@
 RTDECL(uint64_t) RTTimeSystemMilliTS(void)
 {
-    return rtTimeGetSystemNanoTS() / 1000000;
+    return rtTimeGetSystemNanoTS() / RT_NS_1MS;
 }
 
@@ -94 +94 @@
 #endif
     clock_get_calendar_nanotime(&uSecs, &uNanosecs);
-    return RTTimeSpecSetNano(pTime, (uint64_t)uSecs * 1000000000 + uNanosecs);
+    return RTTimeSpecSetNano(pTime, (uint64_t)uSecs * RT_NS_1SEC + uNanosecs);
 }
 

trunk/src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c

@@ -43 +43 @@
     struct timespec tsp;
     nanouptime(&tsp);
-    return tsp.tv_sec * UINT64_C(1000000000)
+    return tsp.tv_sec * RT_NS_1SEC_64
          + tsp.tv_nsec;
 }
@@ -50 +50 @@
 RTDECL(uint64_t) RTTimeMilliTS(void)
 {
-    return RTTimeNanoTS() / 1000;
+    return RTTimeNanoTS() / RT_NS_1MS;
 }
 
@@ -72 +72 @@
     return RTTimeSpecSetTimespec(pTime, &tsp);
 }
+

trunk/src/VBox/Runtime/r0drv/haiku/time-r0drv-haiku.c

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -39 +39 @@
 DECLINLINE(uint64_t) rtTimeGetSystemNanoTS(void)
 {
-    return system_time() * 1000;
+    return system_time() * RT_NS_1US;
 }
 
@@ -45 +45 @@
 DECLINLINE(uint64_t) rtTimeGetSystemMilliTS(void)
 {
-    return system_time() / 1000;
+    return system_time() / RT_NS_1US;
 }
 
@@ -75 +75 @@
 RTDECL(PRTTIMESPEC) RTTimeNow(PRTTIMESPEC pTime)
 {
-    return RTTimeSpecSetNano(pTime, real_time_clock_usecs() * 1000);
+    return RTTimeSpecSetNano(pTime, real_time_clock_usecs() * RT_NS_1US);
 }
 

trunk/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c

@@ -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
@@ -46 +46 @@
     struct timespec Ts;
     ktime_get_ts(&Ts);
-    u64 = Ts.tv_sec * UINT64_C(1000000000) + Ts.tv_nsec;
+    u64 = Ts.tv_sec * RT_NS_1SEC_64 + Ts.tv_nsec;
     return u64;
 
@@ -149 +149 @@
 RTDECL(uint64_t) RTTimeMilliTS(void)
 {
-    return rtTimeGetSystemNanoTS() / 1000000;
+    return rtTimeGetSystemNanoTS() / RT_NS_1MS;
 }
 RT_EXPORT_SYMBOL(RTTimeMilliTS);
@@ -163 +163 @@
 RTDECL(uint64_t) RTTimeSystemMilliTS(void)
 {
-    return rtTimeGetSystemNanoTS() / 1000000;
+    return rtTimeGetSystemNanoTS() / RT_NS_1MS;
 }
 RT_EXPORT_SYMBOL(RTTimeSystemMilliTS);

trunk/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -80 +80 @@
 RTDECL(uint64_t) RTTimeMilliTS(void)
 {
-    return rtTimeGetSystemNanoTS() / 1000000;
+    return rtTimeGetSystemNanoTS() / RT_NS_1MS;
 }
 
@@ -92 +92 @@
 RTDECL(uint64_t) RTTimeSystemMilliTS(void)
 {
-    return rtTimeGetSystemNanoTS() / 1000000;
+    return rtTimeGetSystemNanoTS() / RT_NS_1MS;
 }
 

trunk/src/VBox/Runtime/r0drv/solaris/time-r0drv-solaris.c

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -43 +43 @@
 RTDECL(uint64_t) RTTimeMilliTS(void)
 {
-    return RTTimeNanoTS() / 1000000;
+    return RTTimeNanoTS() / RT_NS_1MS;
 }
 
@@ -55 +55 @@
 RTDECL(uint64_t) RTTimeSystemMilliTS(void)
 {
-    return RTTimeNanoTS() / 1000000;
+    return RTTimeNanoTS() / RT_NS_1MS;
 }
 
@@ -66 +66 @@
     TimeSpec = tod_get();
     mutex_exit(&tod_lock);
-    return RTTimeSpecSetNano(pTime, (uint64_t)TimeSpec.tv_sec * 1000000000 + TimeSpec.tv_nsec);
+    return RTTimeSpecSetNano(pTime, (uint64_t)TimeSpec.tv_sec * RT_NS_1SEC + TimeSpec.tv_nsec);
 }
 

trunk/src/VBox/Runtime/r0drv/solaris/timer-r0drv-solaris.c

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as