Changeset 5355 in vbox for trunk/src/VBox/Runtime

Timestamp:

Oct 17, 2007 1:41:31 PM (17 years ago)

Author:

vboxsync

Message:

Solaris patch 18 (handle cMillies == RT_INDEFINITE_WAIT).

File:

• trunk/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c (modified) (1 diff)

trunk/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c

@@ -162 +162 @@
     else
     {
+        ASMAtomicIncU32(&pEventMultiInt->cWaiters);
+
         /*
          * Translate milliseconds into ticks and go to sleep.
          */
-        int cTicks;
-        clock_t timeout;
         if (cMillies != RT_INDEFINITE_WAIT)
-            cTicks = drv_usectohz((clock_t)(cMillies * 1000L));
+        {
+            int cTicks = drv_usectohz((clock_t)(cMillies * 1000L));
+            clock_t timeout = ddi_get_lbolt();
+            timeout += cTicks;
+            if (fInterruptible)
+                rc = cv_timedwait_sig(&pEventMultiInt->Cnd, &pEventMultiInt->Mtx, timeout);
+            else
+                rc = cv_timedwait(&pEventMultiInt->Cnd, &pEventMultiInt->Mtx, timeout);
+        }
         else
-            cTicks = 0;
-
-        timeout = ddi_get_lbolt();
-        timeout += cTicks;
-        
-        ASMAtomicIncU32(&pThis->cWaiters);
-
-        if (fInterruptible)
-            rc = cv_timedwait_sig(&pThis->Cnd, &pThis->Mtx, timeout);
-        else
-            rc = cv_timedwait(&pThis->Cnd, &pThis->Mtx, timeout);
+        {
+            if (fInterruptible)
+                rc = cv_wait_sig(&pEventMultiInt->Cnd, &pEventMultiInt->Mtx);
+            else
+            {
+                cv_wait(&pEventMultiInt->Cnd, &pEventMultiInt->Mtx);
+                rc = 1;
+            }
+        }
         if (rc > 0)
         {