Changeset 33150 in vbox for trunk/src/VBox/Runtime/r0drv/solaris

Timestamp:

Oct 15, 2010 11:36:00 AM (14 years ago)

Author:

vboxsync

Message:

IPRT/r0drv/solaris: Some more adjustments.

File:

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

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

@@ -35 +35 @@
 #include <iprt/time.h>
 
+
+/** The resolution (nanoseconds) specified when using timeout_generic. */
+#define RTR0SEMSOLWAIT_RESOLUTION   50000
+
+
 /**
  * Solaris semaphore wait structure.
@@ -40 +45 @@
 typedef struct RTR0SEMSOLWAIT
 {
-    /** The absolute timeout given as nano seconds since the start of the
+    /** The absolute timeout given as nanoseconds since the start of the
      *  monotonic clock. */
     uint64_t        uNsAbsTimeout;
-    /** The timeout in nano seconds relative to the start of the wait. */
+    /** The timeout in nanoseconds relative to the start of the wait. */
     uint64_t        cNsRelTimeout;
     /** The native timeout value. */
@@ -213 +218 @@
 DECLINLINE(void) rtR0SemSolWaitDoIt(PRTR0SEMSOLWAIT pWait, kcondvar_t *pCnd, kmutex_t *pMtx)
 {
-    int rc = 1;
     union
     {
@@ -235 +239 @@
                  */
                 u.idCo = g_pfnrtR0Sol_timeout_generic(CALLOUT_REALTIME, rtR0SemSolWaitTimeout, pWait,
-                                                      pWait->uNsAbsTimeout, 50000 /*res*/,
+                                                      pWait->uNsAbsTimeout, RTR0SEMSOLWAIT_RESOLUTION,
                                                       CALLOUT_FLAG_ABSOLUTE);
             }
@@ -271 +275 @@
     /*
      * Do the waiting.
+     * (rc > 0 - normal wake-up; rc == 0 - interruption; rc == -1 - timeout)
      */
+    int rc;
     if (pWait->fInterruptible)
-        rc = cv_wait_sig(pCnd, pMtx);
+    {
+        int rc = cv_wait_sig(pCnd, pMtx);
+        if (RT_UNLIKELY(rc <= 0))
+        {
+            if (RT_LIKELY(rc == 0))
+                pWait->fInterrupted = true;
+            else
+                AssertMsgFailed(("rc=%d\n", rc)); /* no timeouts, see above! */
+        }
+    }
     else
         cv_wait(pCnd, pMtx);
@@ -306 +321 @@
         mutex_enter(pMtx);
     }
-
-    /*
-     * Above zero means normal wake-up.
-     * Interruption is signalled by 0, timeouts by -1.
-     */
-    if (RT_UNLIKELY(rc <= 0))
-    {
-        if (RT_LIKELY(rc == 0))
-            pWait->fInterrupted = true;
-        else
-            AssertMsgFailed(("rc=%d\n", rc)); /* no timeouts, see above! */
-    }
 }
 
@@ -355 +358 @@
     pWait->pThread = NULL;
 }
+
 
 /**
@@ -390 +394 @@
 }
 
+
+/**
+ * Gets the max resolution of the timeout machinery.
+ *
+ * @returns Resolution specified in nanoseconds.
+ */
+DECLINLINE(uint32_t) rtR0SemSolWaitGetResolution(void)
+{
+    return g_pfnrtR0Sol_timeout_generic != NULL
+         ? RTR0SEMSOLWAIT_RESOLUTION
+         : cyclic_getres();
+}
+
 #endif