Changeset 1066041 in mainline for kernel/generic/src/preempt/preemption.c

Timestamp:

2012-07-11T07:58:03Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

935e28c

Parents:

b68ae24

Message:

preemption_disable: Turned functions into macros. Moved THREAD, AS, TASK, CPU into thread.h, as.h, task.h, cpu.h to fix the include hell that ensued.

File:

• kernel/generic/src/preempt/preemption.c (modified) (3 diffs)

kernel/generic/src/preempt/preemption.c

@@ -37 +37 @@
 
 #include <preemption.h>
-#include <arch.h>
-#include <compiler/barrier.h>
-#include <debug.h>
 #include <proc/scheduler.h>
 
-/** Increment preemption disabled counter. */
-void preemption_disable(void)
-{
-        THE->preemption_disabled++;
-        compiler_barrier();
-}
-
-/** Decrement preemption disabled counter. */
-void preemption_enable(void)
-{
-        preemption_enable_noresched();
-        
-        if (PREEMPTION_ENABLED && THREAD && THREAD->need_resched) {
-                preemption_enabled_scheduler();
-        }
-}
-
-/** Decrement preemption disabled counter. */
-void preemption_enable_noresched(void)
-{
-        ASSERT(PREEMPTION_DISABLED);
-        compiler_barrier();
-        THE->preemption_disabled--;
-}
 
 /** Preemption was enabled. Calls scheduler(). */
@@ -71 +44 @@
 {
         ASSERT(PREEMPTION_ENABLED);
+        ASSERT(PREEMPTION_NEEDED);
         
         /* 
@@ -85 +59 @@
 }
 
+/** Sets a flag to reschedule the next time preemption is enabled. */
+void preemption_set_needed(void)
+{
+        /* No need to disable interrupts. */
+        THE->preemption |= PREEMPTION_NEEDED_FLAG;
+}
+
+/** Instructs not to reschedule immediately when preemption is enabled. */
+void preemption_clear_needed(void)
+{
+        /* No need to disable interrupts. */
+        THE->preemption &= ~PREEMPTION_NEEDED_FLAG;
+}
+
 /** @}
  */