X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc_p.h;h=56c810819b56964d2d16c83fe29075fbde8f3e5b;hb=aea9c54dbb7ea4b957f675ffee7266e0432cfd42;hp=f31fc621ff8461416e725722bc531afa221a7f29;hpb=37b6a6530f8d53eda2825b7c34dc8e8895b9fa17;p=bertos.git diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h index f31fc621..56c81081 100644 --- a/bertos/kern/proc_p.h +++ b/bertos/kern/proc_p.h @@ -40,55 +40,55 @@ #ifndef KERN_PROC_P_H #define KERN_PROC_P_H -#include "cfg/cfg_kern.h" +#include "cfg/cfg_proc.h" +#include "cfg/cfg_monitor.h" + #include #include /* for cpu_stack_t */ +#include // IRQ_ASSERT_DISABLED() -#include - -#if CONFIG_KERN_PREEMPT - #include // XXX -#endif - -typedef struct Process -{ -#if CONFIG_KERN_PRI - PriNode link; /**< Link Process into scheduler lists */ -#else - Node link; /**< Link Process into scheduler lists */ -#endif - cpustack_t *stack; /**< Per-process SP */ - iptr_t user_data; /**< Custom data passed to the process */ - -#if CONFIG_KERN_SIGNALS - sigmask_t sig_wait; /**< Signals the process is waiting for */ - sigmask_t sig_recv; /**< Received signals */ -#endif - -#if CONFIG_KERN_HEAP - uint16_t flags; /**< Flags */ -#endif - -#if CONFIG_KERN_HEAP | CONFIG_KERN_MONITOR | (ARCH & ARCH_EMUL) - cpustack_t *stack_base; /**< Base of process stack */ - size_t stack_size; /**< Size of process stack */ -#endif +#include // struct Process -#if CONFIG_KERN_PREEMPT - ucontext_t context; -#endif +/* + * Check if the process context switch can be performed directly by the + * architecture-dependent asm_switch_context() or if it must be delayed + * because we're in the middle of an ISR. + * + * Return true if asm_switch_context() can be executed, false + * otherwise. + * + * NOTE: if an architecture does not implement IRQ_RUNNING() this function + * always returns true. + */ +#define CONTEXT_SWITCH_FROM_ISR() (!IRQ_RUNNING()) -#if CONFIG_KERN_MONITOR - struct ProcMonitor - { - Node link; - const char *name; - } monitor; +#ifndef asm_switch_context +/** + * CPU dependent context switching routines. + * + * Saving and restoring the context on the stack is done by a CPU-dependent + * support routine which usually needs to be written in assembly. + */ +EXTERN_C void asm_switch_context(cpu_stack_t **new_sp, cpu_stack_t **save_sp); #endif -} Process; - +/* + * Save context of old process and switch to new process. + */ +INLINE void proc_switchTo(Process *next, Process *prev) +{ + cpu_stack_t *dummy; + + if (UNLIKELY(next == prev)) + return; + /* + * If there is no old process, we save the old stack pointer into a + * dummy variable that we ignore. In fact, this happens only when the + * old process has just exited. + */ + asm_switch_context(&next->stack, prev ? &prev->stack : &dummy); +} /** * \name Flags for Process.flags. @@ -99,47 +99,106 @@ typedef struct Process /** Track running processes. */ -extern REGISTER Process *CurrentProcess; +extern REGISTER Process *current_process; /** * Track ready processes. * - * Access to this list must be protected with a proc_forbid() / proc_premit() - * pair, or with SCHED_ATOMIC() + * Access to this list must be performed with interrupts disabled */ -extern REGISTER List ProcReadyList; +extern REGISTER List proc_ready_list; #if CONFIG_KERN_PRI - /** - * Enqueue a task in the ready list. - * - * Always use this macro to instert a process in the ready list, as its - * might vary to implement a different scheduling algorithms. - * - * \note This macro is *NOT* protected against the scheduler. Access to - * this list must be performed with interrupts disabled. - */ - #define SCHED_ENQUEUE(proc) do { \ - LIST_ASSERT_VALID(&ProcReadyList); \ - LIST_ENQUEUE(&ProcReadyList, &(proc)->link); \ - } while (0) + #define prio_next() (LIST_EMPTY(&proc_ready_list) ? INT_MIN : \ + ((PriNode *)LIST_HEAD(&proc_ready_list))->pri) + #define prio_proc(proc) (proc->link.pri) + #define prio_curr() prio_proc(current_process) + + #define SCHED_ENQUEUE_INTERNAL(proc) \ + LIST_ENQUEUE(&proc_ready_list, &(proc)->link) + #define SCHED_ENQUEUE_HEAD_INTERNAL(proc) \ + LIST_ENQUEUE_HEAD(&proc_ready_list, &(proc)->link) +#else + #define prio_next() 0 + #define prio_proc(proc) 0 + #define prio_curr() 0 + + #define SCHED_ENQUEUE_INTERNAL(proc) ADDTAIL(&proc_ready_list, &(proc)->link) + #define SCHED_ENQUEUE_HEAD_INTERNAL(proc) ADDHEAD(&proc_ready_list, &(proc)->link) +#endif + +/** + * Enqueue a process in the ready list. + * + * Always use this macro to instert a process in the ready list, as its + * might vary to implement a different scheduling algorithms. + * + * \note Access to the scheduler ready list must be performed with + * interrupts disabled. + */ +#define SCHED_ENQUEUE(proc) do { \ + IRQ_ASSERT_DISABLED(); \ + LIST_ASSERT_VALID(&proc_ready_list); \ + SCHED_ENQUEUE_INTERNAL(proc); \ + } while (0) + +#define SCHED_ENQUEUE_HEAD(proc) do { \ + IRQ_ASSERT_DISABLED(); \ + LIST_ASSERT_VALID(&proc_ready_list); \ + SCHED_ENQUEUE_HEAD_INTERNAL(proc); \ + } while (0) -#else // !CONFIG_KERN_PRI - #define SCHED_ENQUEUE(proc) do { \ - LIST_ASSERT_VALID(&ProcReadyList); \ - ADDTAIL(&ProcReadyList, &(proc)->link); \ - } while (0) +#if CONFIG_KERN_PRI +/** + * Changes the priority of an already enqueued process. + * + * Searches and removes the process from the ready list, then uses LIST_ENQUEUE(() + * to insert again to fix priority. + * + * No action is performed for processes that aren't in the ready list, eg. in semaphore queues. + * + * \note Performance could be improved with a different implementation of priority list. + */ +INLINE void sched_reenqueue(struct Process *proc) +{ + IRQ_ASSERT_DISABLED(); + LIST_ASSERT_VALID(&proc_ready_list); + Node *n; + PriNode *pos = NULL; + FOREACH_NODE(n, &proc_ready_list) + { + if (n == &proc->link.link) + { + pos = (PriNode *)n; + break; + } + } + + // only remove and enqueue again if process is already in the ready list + // otherwise leave it alone + if (pos) + { + REMOVE(&proc->link.link); + LIST_ENQUEUE(&proc_ready_list, &proc->link); + } +} +#endif //CONFIG_KERN_PRI -#endif // !CONFIG_KERN_PRI +/* Process trampoline */ +void proc_entry(void); -/** Schedule to another process *without* adding the current to the ready list. */ +/* Schedule another process *without* adding the current one to the ready list. */ +void proc_switch(void); + +/* Low level scheduling routine. */ void proc_schedule(void); -#if CONFIG_KERN_PREEMPT -void proc_entry(void (*user_entry)(void)); -void preempt_init(void); -#endif +/* Low level context switch routine. */ +void proc_switchTo(Process *next, Process *prev); + +/* Initialize a scheduler class. */ +void proc_schedInit(void); #if CONFIG_KERN_MONITOR /** Initialize the monitor */