Changeset 33630 in vbox for trunk/src

Timestamp:

Oct 31, 2010 4:00:19 PM (14 years ago)

Author:

vboxsync

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

67241

Message:

waitqueue-r0drv-linux.h: Use the RT_NS/US_1SEC constants.

File:

• trunk/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h

@@ -101 +101 @@
 /** @todo optimize: millisecs -> nanosecs -> millisec -> jiffies */
         if (fFlags & RTSEMWAIT_FLAGS_MILLISECS)
-            uTimeout = uTimeout < UINT64_MAX / UINT32_C(1000000) * UINT32_C(1000000)
-                     ? uTimeout * UINT32_C(1000000)
+            uTimeout = uTimeout < UINT64_MAX / RT_US_1SEC * RT_US_1SEC
+                     ? uTimeout * RT_US_1SEC
                      : UINT64_MAX;
         if (uTimeout == UINT64_MAX)
@@ -137 +137 @@
 #ifdef IPRT_LINUX_HAS_HRTIMER
         if (   (fFlags & (RTSEMWAIT_FLAGS_NANOSECS | RTSEMWAIT_FLAGS_ABSOLUTE))
-            || pWait->cNsRelTimeout < UINT32_C(1000000000) / HZ * 4)
+            || pWait->cNsRelTimeout < RT_NS_1SEC / HZ * 4)
         {
             pWait->fHighRes     = true;
 # if BITS_PER_LONG < 64
             if (   KTIME_SEC_MAX <= LONG_MAX
-                && pWait->uNsAbsTimeout >= KTIME_SEC_MAX * UINT64_C(1000000000) + UINT64_C(999999999))
+                && pWait->uNsAbsTimeout >= KTIME_SEC_MAX * RT_NS_1SEC_64 + (RT_NS_1SEC - 1))
                 fFlags |= RTSEMWAIT_FLAGS_INDEFINITE;
             else
@@ -151 +151 @@
 #endif
         {
-            uint64_t cJiffies = ASMMultU64ByU32DivByU32(pWait->cNsRelTimeout, HZ, UINT32_C(1000000000));
+            uint64_t cJiffies = ASMMultU64ByU32DivByU32(pWait->cNsRelTimeout, HZ, RT_NS_1SEC);
             if (cJiffies >= MAX_JIFFY_OFFSET)
                 fFlags |= RTSEMWAIT_FLAGS_INDEFINITE;
@@ -279 +279 @@
     return RTR0SEMLNXWAIT_RESOLUTION;
 #else
-    return 1000000000 / HZ; /* ns */
-#endif
-}
-
-#endif
-
+    return RT_NS_1SEC / HZ; /* ns */
+#endif
+}
+
+#endif
+