X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc_p.h;h=64fabb1290fef6052231bf3e682fb9c8a4830f49;hb=f35b6066ecdeffcc8998dd566b5246bdcf43c548;hp=2c914d9e81698d2645507800c406a205407a412b;hpb=cf6017f59fb2ff71423c716ad9d9f60a1b65c7d0;p=bertos.git diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h index 2c914d9e..64fabb12 100644 --- a/bertos/kern/proc_p.h +++ b/bertos/kern/proc_p.h @@ -40,56 +40,26 @@ #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_PREEMPTIVE - #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 */ +#include // struct 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 - -#if CONFIG_KERN_PREEMPTIVE - ucontext_t context; -#endif - -#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; - - /** * \name Flags for Process.flags. * \{ @@ -99,48 +69,104 @@ 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) - -#else // !CONFIG_KERN_PRI - - #define SCHED_ENQUEUE(proc) do { \ - LIST_ASSERT_VALID(&ProcReadyList); \ - ADDTAIL(&ProcReadyList, &(proc)->link); \ - } while (0) - -#endif // !CONFIG_KERN_PRI - -/** Schedule to another process *without* adding the current to the ready list. */ -void proc_schedule(void); + #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 -#if CONFIG_KERN_PREEMPT -void proc_entry(void (*user_entry)(void)); -void preempt_init(void); + #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) + + +#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 + +/* Process trampoline */ +void proc_entry(void); + +/* Schedule another process *without* adding the current one to the ready list. */ +void proc_switch(void); + +/* Immediately schedule a particular process bypassing the scheduler. */ +void proc_wakeup(Process *proc); + +/* Initialize a scheduler class. */ +void proc_schedInit(void); + #if CONFIG_KERN_MONITOR /** Initialize the monitor */ void monitor_init(void); @@ -155,4 +181,38 @@ void preempt_init(void); void monitor_rename(Process *proc, const char *name); #endif /* CONFIG_KERN_MONITOR */ +#if CONFIG_KERN_PREEMPT +INLINE int preempt_quantum(void) +{ + extern int _proc_quantum; + return _proc_quantum; +} + +INLINE void proc_decQuantum(void) +{ + extern int _proc_quantum; + if (_proc_quantum > 0) + _proc_quantum--; +} + +INLINE void preempt_reset_quantum(void) +{ + extern int _proc_quantum; + _proc_quantum = CONFIG_KERN_QUANTUM; +} +#else /* !CONFIG_KERN_PREEMPT */ +INLINE int preempt_quantum(void) +{ + return 0; +} + +INLINE void proc_decQuantum(void) +{ +} + +INLINE void preempt_reset_quantum(void) +{ +} +#endif /* CONFIG_KERN_PREEMPT */ + #endif /* KERN_PROC_P_H */