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

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.

File:

• trunk/src/VBox/Runtime/r3/linux/time-linux.cpp (modified) (4 diffs)

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;
 }