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

Timestamp:

Jun 24, 2009 11:51:48 PM (16 years ago)

Author:

vboxsync

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

49073

Message:

semeventmulti-r0drv-nt.cpp,semevent-r0drv-nt.cpp: Seems it's ok to allocate the timerout value on the stack, at least according to the vista driver verifier. Just use the specified interruptibility as a UserMode/KernelMode indicator.

Location:

trunk/src/VBox/Runtime/r0drv/nt

Files:

• semevent-r0drv-nt.cpp (modified) (2 diffs)
• semeventmulti-r0drv-nt.cpp (modified) (2 diffs)

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

@@ -136 +136 @@
     }
 
+#if 1
+    /*
+     * Wait for it.
+     * We're assuming interruptible waits should happen at UserMode level.
+     */
+    NTSTATUS        rcNt;
+    KPROCESSOR_MODE WaitMode   = fInterruptible ? UserMode : KernelMode;
+    KWAIT_REASON    WaitReason = Executive; /*fInterruptible ? Executive : UserRequest; ?*/
+    if (cMillies == RT_INDEFINITE_WAIT)
+        rcNt = KeWaitForSingleObject(&pEventInt->Event, WaitReason, WaitMode, fInterruptible, NULL);
+    else
+    {
+        LARGE_INTEGER Timeout;
+        Timeout.QuadPart = -(int64_t)cMillies * 10000;
+        rcNt = KeWaitForSingleObject(&pEventInt->Event, WaitReason, WaitMode, fInterruptible, &Timeout);
+    }
+#else
     /*
      * Wait for it.
      *
-     * We default to UserMode here as the waits might be aborted due to process termination. 
+     * We default to UserMode here as the waits might be aborted due to process termination.
      * @todo As far as I can tell this is currently safe as all calls are made on behalf of user threads.
      */
@@ -156 +173 @@
         RTMemFree(pTimeout);
     }
+#endif
     switch (rcNt)
     {

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

@@ -143 +143 @@
     AssertMsgReturn(pThis->u32Magic == RTSEMEVENTMULTI_MAGIC, ("%p u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_PARAMETER);
 
+#if 1
+    /*
+     * Wait for it.
+     * We're assuming interruptible waits should happen at UserMode level.
+     */
+    NTSTATUS        rcNt;
+    KPROCESSOR_MODE WaitMode   = fInterruptible ? UserMode : KernelMode;
+    KWAIT_REASON    WaitReason = Executive; /*fInterruptible ? Executive : UserRequest; ?*/
+    if (cMillies == RT_INDEFINITE_WAIT)
+        rcNt = KeWaitForSingleObject(&pThis->Event, WaitReason, WaitMode, fInterruptible, NULL);
+    else
+    {
+        LARGE_INTEGER Timeout;
+        Timeout.QuadPart = -(int64_t)cMillies * 10000;
+        rcNt = KeWaitForSingleObject(&pThis->Event, WaitReason, WaitMode, fInterruptible, &Timeout);
+    }
+#else
     /*
      * Wait for it.
      *
-     * We default to UserMode here as the waits might be aborted due to process termination. 
+     * We default to UserMode here as the waits might be aborted due to process termination.
      * @todo As far as I can tell this is currently safe as all calls are made on behalf of user threads.
      */
@@ -163 +180 @@
         RTMemFree(pTimeout);
     }
+#endif
     switch (rcNt)
     {