Changeset 52996 in vbox for trunk

Timestamp:

Oct 8, 2014 3:58:55 PM (10 years ago)

Author:

vboxsync

Message:

Runtime/r0drv/solaris: Fix timeouts to work for semevents when using non-highres callbacks.

File:

• trunk/src/VBox/Runtime/r0drv/solaris/semeventwait-r0drv-solaris.h (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/solaris/semeventwait-r0drv-solaris.h

@@ -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
@@ -57 +57 @@
     union
     {
-        /** The timeout (abs lbolt) when fHighRes is false.  */
+        /** The timeout (in ticks) when fHighRes is false.  */
         clock_t     lTimeout;
     } u;
@@ -108 +108 @@
     {
         if (fFlags & RTSEMWAIT_FLAGS_MILLISECS)
-            uTimeout = uTimeout < UINT64_MAX / UINT32_C(1000000) * UINT32_C(1000000)
-                     ? uTimeout * UINT32_C(1000000)
+            uTimeout = uTimeout < UINT64_MAX / RT_NS_1MS
+                     ? uTimeout * RT_NS_1MS
                      : UINT64_MAX;
         if (uTimeout == UINT64_MAX)
@@ -156 +156 @@
             else
             {
-                pWait->u.lTimeout = ddi_get_lbolt() + cTicks;
+                pWait->u.lTimeout = drv_usectohz(uTimeout / RT_NS_1US_64);
                 pWait->fHighRes = false;
             }