Changeset 5165 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Oct 5, 2007 1:32:50 PM (17 years ago)

Author:

vboxsync

Message:

RTSemEventWaitNoResume

Location:

trunk/src/VBox/Runtime/r0drv

Files:

• linux/semaphore-r0drv-linux.c (modified) (2 diffs)
• nt/semaphore-r0drv-nt.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/linux/semaphore-r0drv-linux.c

@@ -143 +143 @@
 
 
-RTDECL(int)  RTSemEventWait(RTSEMEVENT EventSem, unsigned cMillies)
-{
-    /*
-     * Validate input.
-     */
+/**
+ * Worker for RTSemEvent and RTSemEventNoResume.
+ *
+ * @returns VBox status code.
+ * @param   pEventInt           The event semaphore.
+ * @param   cMillies            The number of milliseconds to wait.
+ * @param   fInterruptible      Whether it's an interruptible wait or not.
+ */
+static int rtSemEventWait(PRTSEMEVENTINTERNAL pEventInt, unsigned cMillies, bool fInterruptible)
+{
+    /*
+     * Ok wait for it.
+     */
+    DEFINE_WAIT(Wait);
+    int     rc       = VINF_SUCCESS;
+    long    lTimeout = cMillies == RT_INDEFINITE_WAIT ? MAX_SCHEDULE_TIMEOUT : msecs_to_jiffies(cMillies);
+    for (;;)
+    {
+        /* make everything thru schedule() atomic scheduling wise. */
+        prepare_to_wait(&pEventInt->Head, &Wait, fInterruptible ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
+
+        /* check the condition. */
+        if (ASMAtomicCmpXchgU32(&pEventInt->fState, 0, 1))
+            break;
+
+        /* check for pending signals. */
+        if (fInterruptible && signal_pending(current))
+        {
+            rc = VERR_INTERRUPTED;
+            break;
+        }
+
+        /* wait */
+        lTimeout = schedule_timeout(lTimeout);
+
+        /* Check if someone destroyed the semaphore while we were waiting. */
+        if (pEventInt->u32Magic != RTSEMEVENT_MAGIC)
+        {
+            rc = VERR_SEM_DESTROYED;
+            break;
+        }
+
+        /* check for timeout. */
+        if (!lTimeout)
+        {
+            rc = VERR_TIMEOUT;
+            break;
+        }
+    }
+
+    finish_wait(&pEventInt->Head, &Wait);
+    return rc;
+}
+
+
+RTDECL(int) RTSemEventWait(RTSEMEVENT EventSem, unsigned cMillies)
+{
     PRTSEMEVENTINTERNAL pEventInt = (PRTSEMEVENTINTERNAL)EventSem;
     if (!pEventInt)
@@ -158 +210 @@
     }
 
-    /*
-     * Try get it.
-     */
     if (ASMAtomicCmpXchgU32(&pEventInt->fState, 0, 1))
         return VINF_SUCCESS;
-    else
-    {
-        /*
-         * Ok wait for it.
-         */
-        DEFINE_WAIT(Wait);
-        int     rc       = VINF_SUCCESS;
-        long    lTimeout = cMillies == RT_INDEFINITE_WAIT ? MAX_SCHEDULE_TIMEOUT : msecs_to_jiffies(cMillies);
-        for (;;)
-        {
-            /* make everything thru schedule() atomic scheduling wise. */
-            prepare_to_wait(&pEventInt->Head, &Wait, TASK_INTERRUPTIBLE);
-
-            /* check the condition. */
-            if (ASMAtomicCmpXchgU32(&pEventInt->fState, 0, 1))
-                break;
-
-            /* check for pending signals. */
-            if (signal_pending(current))
-            {
-                rc = VERR_INTERRUPTED; /** @todo VERR_INTERRUPTED isn't correct anylonger. please fix r0drv stuff! */
-                break;
-            }
-
-            /* wait */
-            lTimeout = schedule_timeout(lTimeout);
-
-            /* Check if someone destroyed the semaphore while we were waiting. */
-            if (pEventInt->u32Magic != RTSEMEVENT_MAGIC)
-            {
-                rc = VERR_SEM_DESTROYED;
-                break;
-            }
-
-            /* check for timeout. */
-            if (!lTimeout)
-            {
-                rc = VERR_TIMEOUT;
-                break;
-            }
-        }
-        finish_wait(&pEventInt->Head, &Wait);
-        return rc;
-    }
-}
+    return rtSemEventWait(pEventInt, cMillies, false /* fInterruptible */);
+}
+
+
+RTDECL(int) RTSemEventWaitNoResume(RTSEMEVENT EventSem, unsigned cMillies)
+{
+    PRTSEMEVENTINTERNAL pEventInt = (PRTSEMEVENTINTERNAL)EventSem;
+    if (!pEventInt)
+        return VERR_INVALID_PARAMETER;
+    if (    !pEventInt
+        ||  pEventInt->u32Magic != RTSEMEVENT_MAGIC)
+    {
+        AssertMsgFailed(("pEventInt->u32Magic=%RX32 pEventInt=%p\n", pEventInt ? pEventInt->u32Magic : 0, pEventInt));
+        return VERR_INVALID_PARAMETER;
+    }
+
+    if (ASMAtomicCmpXchgU32(&pEventInt->fState, 0, 1))
+        return VINF_SUCCESS;
+    return rtSemEventWait(pEventInt, cMillies, true /* fInterruptible */);
+}
+
 
 

trunk/src/VBox/Runtime/r0drv/nt/semaphore-r0drv-nt.cpp

@@ -141 +141 @@
 
 
-RTDECL(int)  RTSemEventWait(RTSEMEVENT EventSem, unsigned cMillies)
+static int rtSemEventWait(RTSEMEVENT EventSem, unsigned cMillies, bool fInterruptible)
 {
     /*
@@ -161 +161 @@
     NTSTATUS rcNt;
     if (cMillies == RT_INDEFINITE_WAIT)
-        rcNt = KeWaitForSingleObject(&pEventInt->Event, Executive, KernelMode, TRUE, NULL);
+        rcNt = KeWaitForSingleObject(&pEventInt->Event, Executive, KernelMode, fInterruptible, NULL);
     else
     {
         LARGE_INTEGER Timeout;
         Timeout.QuadPart = -(int64_t)cMillies * 10000;
-        rcNt = KeWaitForSingleObject(&pEventInt->Event, Executive, KernelMode, TRUE, &Timeout);
+        rcNt = KeWaitForSingleObject(&pEventInt->Event, Executive, KernelMode, fInterruptible, &Timeout);
     }
     switch (rcNt)
@@ -175 +175 @@
             return VERR_SEM_DESTROYED;
         case STATUS_ALERTED:
-            return VERR_INTERRUPTED; /** @todo VERR_INTERRUPTED isn't correct anylonger. please fix r0drv stuff! */
+            return VERR_INTERRUPTED;
         case STATUS_USER_APC:
-            return VERR_INTERRUPTED; /** @todo VERR_INTERRUPTED isn't correct anylonger. please fix r0drv stuff! */
+            return VERR_INTERRUPTED;
         case STATUS_TIMEOUT:
             return VERR_TIMEOUT;
@@ -187 +187 @@
 }
 
+
+RTDECL(int)  RTSemEventWait(RTSEMEVENT EventSem, unsigned cMillies)
+{
+    return rtSemEventWait(EventSem, cMillies, false /* fInterruptible */);
+}
+
+
+RTDECL(int)  RTSemEventWaitNoResume(RTSEMEVENT EventSem, unsigned cMillies)
+{
+    return rtSemEventWait(EventSem, cMillies, true /* fInterruptible */);
+}