Changeset 33381 in vbox

Timestamp:

Oct 24, 2010 1:48:39 PM (14 years ago)

Author:

vboxsync

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

66967

Message:

FreeBSD: Fix absolut timeouts. The sleepq_* KPI takes uses only relative timeouts. Fixes the hanging tstSupSem testcase and SMP guests

File:

• trunk/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h (modified) (3 diffs)

trunk/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h

@@ -110 +110 @@
                 if (u64Now >= uTimeout)
                     return VERR_TIMEOUT;
+
+                uTimeout -= u64Now; /* Get a relative value. */
             }
         }
@@ -117 +119 @@
     {
         pWait->fIndefinite      = false;
+
+#if 0
+        struct timeval tv;
+
+        tv.tv_sec = uTimeout / UINT64_C(1000000000);
+        tv.tv_usec = (uTimeout % UINT64_C(1000000000)) / UINT64_C(1000);
+
+        pWait->iTimeout = tvtohz(&tv);
+#else
         uint64_t cTicks = ASMMultU64ByU32DivByU32(uTimeout, hz, UINT32_C(1000000000));
         if (cTicks >= INT_MAX)
@@ -122 +133 @@
         else
             pWait->iTimeout     = (int)cTicks;
+#endif
     }