Changeset 1066041 in mainline for kernel/generic/src/proc

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.

Location:

kernel/generic/src/proc

Files:

• scheduler.c (modified) (2 diffs)
• the.c (modified) (2 diffs)
• thread.c (modified) (1 diff)

kernel/generic/src/proc/scheduler.c

@@ -65 +65 @@
 #include <debug.h>
 #include <stacktrace.h>
+#include <cpu.h>
 
 static void scheduler_separated_stack(void);
@@ -421 +422 @@
                 after_thread_ran();
                 
-                THREAD->need_resched = false;
+                preemption_clear_needed();
                 
                 switch (THREAD->state) {

kernel/generic/src/proc/the.c

@@ -43 +43 @@
 
 #include <arch.h>
+#include <debug.h>
 
 /** Initialize THE structure
@@ -53 +54 @@
 void the_initialize(the_t *the)
 {
-        the->preemption_disabled = 0;
+        the->preemption = 0;
         the->cpu = NULL;
         the->thread = NULL;

kernel/generic/src/proc/thread.c

@@ -375 +375 @@
         thread->nomigrate = 0;
         thread->state = Entering;
-        thread->need_resched = false;
         
         timeout_initialize(&thread->sleep_timeout);