Changeset 935e28c in mainline

Timestamp:

2012-07-12T15:58:46Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

2e16033

Parents:

1066041

Message:

preemption_disable: Fixed bug that called scheduler() from interrupts. It disables calling scheduler() from preemption_enable() until in_exc_handler() is implemented properly.

Location:

kernel/generic/src

Files:

• preempt/preemption.c (modified) (2 diffs)
• proc/scheduler.c (modified) (1 diff)

kernel/generic/src/preempt/preemption.c

@@ -40 +40 @@
 
 
+/** Determines if we are executing an exception/interrupt handler. */
+static bool in_exc_handler(void)
+{
+        /* Err on the safe side until all exception processing code is audited. */
+        return true;
+}
+
 /** Preemption was enabled. Calls scheduler(). */
 void preemption_enabled_scheduler(void)
@@ -54 +61 @@
          * to suppress preemption continues to work.
          */
-        if (!interrupts_disabled()) {
+        if (!interrupts_disabled() && !in_exc_handler()) {
+                preemption_clear_needed();
+                /* We may be preempted here, so we'll scheduler() again. Too bad. */
                 scheduler();
-        }
+        } 
 }
 

kernel/generic/src/proc/scheduler.c

@@ -422 +422 @@
                 after_thread_ran();
                 
-                preemption_clear_needed();
-                
                 switch (THREAD->state) {
                 case Running: