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

Timestamp:

May 23, 2009 12:43:34 PM (16 years ago)

Author:

vboxsync

Message:

IPRT: Merge RTThreadPreemptDisable-r0drv-linux.c & RTThreadPreemptRestore-r0drv-linux.c into thread-r0drv-linux.c and move over the preemption stuff from thread2-r0drv-linux.c.

Location:

trunk/src/VBox/Runtime/r0drv/linux

Files:

• RTThreadPreemptDisable-r0drv-linux.c (deleted)
• RTThreadPreemptRestore-r0drv-linux.c (deleted)
• thread-r0drv-linux.c (modified) (2 diffs)
• thread2-r0drv-linux.c (modified) (1 diff)

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

@@ -36 +36 @@
 #include <iprt/thread.h>
 #include <iprt/err.h>
+#include <iprt/assert.h>
 
 
@@ -67 +68 @@
 }
 
+
+RTDECL(bool) RTThreadPreemptIsEnabled(RTTHREAD hThread)
+{
+    Assert(hThread == NIL_RTTHREAD);
+    return !in_atomic() && !irqs_disabled();
+}
+
+
+RTDECL(bool) RTThreadPreemptIsPending(RTTHREAD hThread)
+{
+    Assert(hThread == NIL_RTTHREAD);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 4)
+    return test_tsk_thread_flag(current, TIF_NEED_RESCHED);
+
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 20)
+    return need_resched();
+
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 1, 110)
+    return current->need_resched != 0;
+
+#else
+    return need_resched != 0;
+#endif
+}
+
+
+RTDECL(void) RTThreadPreemptDisable(PRTTHREADPREEMPTSTATE pState)
+{
+    AssertPtr(pState);
+    Assert(pState->uchDummy != 42);
+    pState->uchDummy = 42;
+
+    /*
+     * Note: This call is a NOP if CONFIG_PREEMPT is not enabled in the Linux kernel
+     * configuration. In that case, schedule() is only called need_resched() is set
+     * which is tested just before we return to R3 (not when returning from R0 to R0).
+     */
+    preempt_disable();
+}
+
+
+RTDECL(void) RTThreadPreemptRestore(PRTTHREADPREEMPTSTATE pState)
+{
+    AssertPtr(pState);
+    Assert(pState->uchDummy == 42);
+    pState->uchDummy = 0;
+
+    preempt_enable();
+}
+

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

@@ -48 +48 @@
 
 
-RTDECL(bool) RTThreadPreemptIsEnabled(RTTHREAD hThread)
-{
-    Assert(hThread == NIL_RTTHREAD);
-    return !in_atomic() && !irqs_disabled();
-}
 
-
-RTDECL(bool) RTThreadPreemptIsPending(RTTHREAD hThread)
-{
-    Assert(hThread == NIL_RTTHREAD);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 4)
-    return test_tsk_thread_flag(current, TIF_NEED_RESCHED);
-
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 20)
-    return need_resched();
-
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 1, 110)
-    return current->need_resched != 0;
-
-#else
-    return need_resched != 0;
-#endif
-}
-