X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc_p.h;h=2c914d9e81698d2645507800c406a205407a412b;hb=ecc3d927e252b3fa278b5320f16364fc14d61220;hp=6a79eec30d6048194f359f40458e3d8943b39e2d;hpb=87302355709b6d5ac0592024b84207ba86baa82e;p=bertos.git diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h index 6a79eec3..2c914d9e 100644 --- a/bertos/kern/proc_p.h +++ b/bertos/kern/proc_p.h @@ -45,11 +45,19 @@ #include /* for cpu_stack_t */ -#include +#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 */ @@ -58,10 +66,6 @@ typedef struct Process sigmask_t sig_recv; /**< Received signals */ #endif -#if CONFIG_KERN_PREEMPTIVE - int forbid_cnt; /**< Nesting count for proc_forbid()/proc_permit(). */ -#endif - #if CONFIG_KERN_HEAP uint16_t flags; /**< Flags */ #endif @@ -71,6 +75,10 @@ typedef struct Process size_t stack_size; /**< Size of process stack */ #endif +#if CONFIG_KERN_PREEMPTIVE + ucontext_t context; +#endif + #if CONFIG_KERN_MONITOR struct ProcMonitor { @@ -101,21 +109,38 @@ extern REGISTER Process *CurrentProcess; */ extern REGISTER List ProcReadyList; - -/** - * 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) ADDTAIL(&ProcReadyList, &(proc)->link) +#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); +#if CONFIG_KERN_PREEMPT +void proc_entry(void (*user_entry)(void)); +void preempt_init(void); +#endif + #if CONFIG_KERN_MONITOR /** Initialize the monitor */ void monitor_init(void);