Changeset 33384 in vbox for trunk

Timestamp:

Oct 24, 2010 2:57:44 PM (14 years ago)

Author:

vboxsync

Message:

FreeBSD: More fixes to the RTSemEventWaitEx code. tstSupSem passes completely now.

File:

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

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

@@ -36 +36 @@
 #include <iprt/time.h>
 
-/** The resolution (nanoseconds) specified when using
- *  schedule_hrtimeout_range. */
-#define RTR0SEMLNXWAIT_RESOLUTION   50000
-
-
 /**
  * Kernel mode Linux wait state structure.
@@ -46 +41 @@
 typedef struct RTR0SEMBSDSLEEP
 {
+    /** The absolute timeout given as nano seconds since the start of the
+     *  monotonic clock. */
+    uint64_t        uNsAbsTimeout;
     /** The timeout in ticks. Updated after waiting. */
     int             iTimeout;
@@ -65 +63 @@
 
 /**
+ * Updates the timeout of the FreeBSD wait.
+ *
+ * @returns RTSEMWAIT_FLAGS_INDEFINITE if the timeout value is too big.
+ *          0 otherwise
+ * @param   pWait               The wait structure.
+ * @param   uTimeout            The relative timeout in nanoseconds.
+ */
+DECLINLINE(uint32_t) rtR0SemBsdWaitUpdateTimeout(PRTR0SEMBSDSLEEP pWait, uint64_t uTimeout)
+{
+#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)
+        return RTSEMWAIT_FLAGS_INDEFINITE;
+    else
+        pWait->iTimeout     = (int)cTicks;
+#endif
+
+    return 0;
+}
+
+/**
  * Initializes a wait.
  *
@@ -80 +106 @@
 {
     pWait->iTimeout = 0;
+    pWait->uNsAbsTimeout = 0; /* shut up gcc */
 
     /*
@@ -104 +131 @@
                 if (u64Now + uTimeout < u64Now) /* overflow */
                     fFlags |= RTSEMWAIT_FLAGS_INDEFINITE;
+                else
+                    pWait->uNsAbsTimeout = u64Now + uTimeout;
             }
             else
@@ -111 +140 @@
                     return VERR_TIMEOUT;
 
+                pWait->uNsAbsTimeout = uTimeout;
                 uTimeout -= u64Now; /* Get a relative value. */
             }
@@ -119 +149 @@
     {
         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)
-            fFlags |= RTSEMWAIT_FLAGS_INDEFINITE;
-        else
-            pWait->iTimeout     = (int)cTicks;
-#endif
+        fFlags |= rtR0SemBsdWaitUpdateTimeout(pWait, uTimeout);
     }
 
@@ -140 +156 @@
         pWait->fIndefinite      = true;
         pWait->iTimeout         = INT_MAX;
+        pWait->uNsAbsTimeout    = UINT64_MAX;
     }
 
@@ -208 +225 @@
         case 0:
             break;
+        case ERESTART:
+        {
+            if (!pWait->fIndefinite)
+            {
+                /* Recalc timeout. */
+                uint64_t u64Now = RTTimeSystemNanoTS();
+                if (u64Now >= pWait->uNsAbsTimeout)
+                    pWait->fTimedOut = true;
+                else
+                {
+                    u64Now = pWait->uNsAbsTimeout - u64Now;
+                    rtR0SemBsdWaitUpdateTimeout(pWait, u64Now);
+                }
+            }
+            break;
+        }
         case EWOULDBLOCK:
             pWait->fTimedOut = true;
             break;
         case EINTR:
-        case ERESTART:
+            Assert(pWait->fInterruptible);
             pWait->fInterrupted = true;
             break;