X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc.c;h=15fe5b7f79112bf6b36662611e603148692c6036;hb=f709a37e5659fd591b5a61d80b45257105ac1850;hp=577f0db43e2d8a6925b55e09229c5461d69a715d;hpb=0eeba5822b3ff0e76ae0fd0272536d371d272d7d;p=bertos.git diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c index 577f0db4..15fe5b7f 100644 --- a/bertos/kern/proc.c +++ b/bertos/kern/proc.c @@ -30,8 +30,7 @@ * Copyright 1999, 2000, 2001, 2008 Bernie Innocenti * --> * - * \brief Simple realtime multitasking scheduler. - * Context switching is only done cooperatively. + * \brief Simple cooperative multitasking scheduler. * * \version $Id$ * \author Bernie Innocenti @@ -41,8 +40,10 @@ #include "proc_p.h" #include "proc.h" -#include "cfg/cfg_arch.h" /* ARCH_EMUL */ -#include "cfg/cfg_kern.h" +#include "cfg/cfg_arch.h" // ARCH_EMUL +#include "cfg/cfg_proc.h" +#include "cfg/cfg_monitor.h" +#include // ROUND_UP2 #include #include // CONFIG_DEPEND() @@ -51,13 +52,11 @@ #include #include -#include /* memset() */ - -// Check config dependencies -CONFIG_DEPEND(CONFIG_KERN_SIGNALS, CONFIG_KERN_SCHED); -CONFIG_DEPEND(CONFIG_KERN_SEMAPHORES, CONFIG_KERN_SIGNALS); -CONFIG_DEPEND(CONFIG_KERN_MONITOR, CONFIG_KERN_SCHED); +#if CONFIG_KERN_HEAP + #include +#endif +#include /* memset() */ /* * The scheduer tracks ready processes by enqueuing them in the @@ -84,8 +83,8 @@ REGISTER Process *CurrentProcess; */ List StackFreeList; -#define NPROC 8 -cpustack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpustack_t)]; +#define NPROC 10 +cpu_stack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpu_stack_t)]; #endif /** The main process (the one that executes main()). */ @@ -99,6 +98,7 @@ static void proc_init_struct(Process *proc) #if CONFIG_KERN_SIGNALS proc->sig_recv = 0; + proc->sig_wait = 0; #endif #if CONFIG_KERN_HEAP @@ -108,6 +108,7 @@ static void proc_init_struct(Process *proc) #if CONFIG_KERN_PRI proc->link.pri = 0; #endif + } MOD_DEFINE(proc); @@ -148,10 +149,10 @@ void proc_init(void) * \return Process structure of new created process * if successful, NULL otherwise. */ -struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)(void), iptr_t data, size_t stack_size, cpustack_t *stack_base) +struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)(void), iptr_t data, size_t stack_size, cpu_stack_t *stack_base) { Process *proc; - const size_t PROC_SIZE_WORDS = ROUND_UP2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t); + const size_t PROC_SIZE_WORDS = ROUND_UP2(sizeof(Process), sizeof(cpu_stack_t)) / sizeof(cpu_stack_t); #if CONFIG_KERN_HEAP bool free_stack = false; #endif @@ -159,7 +160,8 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry) #if (ARCH & ARCH_EMUL) /* Ignore stack provided by caller and use the large enough default instead. */ - PROC_ATOMIC(stack_base = (cpustack_t *)list_remHead(&StackFreeList)); + PROC_ATOMIC(stack_base = (cpu_stack_t *)list_remHead(&StackFreeList)); + ASSERT(stack_base); stack_size = CONFIG_KERN_MINSTACKSIZE; #elif CONFIG_KERN_HEAP @@ -186,8 +188,13 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry) #endif // !ARCH_EMUL && !CONFIG_KERN_HEAP #if CONFIG_KERN_MONITOR - /* Fill-in the stack with a special marker to help debugging */ - memset(stack_base, CONFIG_KERN_STACKFILLCODE, stack_size); + /* + * Fill-in the stack with a special marker to help debugging. + * On 64bit platforms, CONFIG_KERN_STACKFILLCODE is larger + * than an int, so the (int) cast is required to silence the + * warning for truncating its size. + */ + memset(stack_base, (int)CONFIG_KERN_STACKFILLCODE, stack_size); #endif /* Initialize the process control block */ @@ -195,17 +202,23 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry) { proc = (Process *)stack_base; proc->stack = stack_base + PROC_SIZE_WORDS; + // On some architecture stack should be aligned, so we do it. + proc->stack = (cpu_stack_t *)((uintptr_t)proc->stack + (sizeof(cpu_aligned_stack_t) - ((uintptr_t)proc->stack % sizeof(cpu_aligned_stack_t)))); if (CPU_SP_ON_EMPTY_SLOT) proc->stack++; } else { - proc = (Process *)(stack_base + stack_size / sizeof(cpustack_t) - PROC_SIZE_WORDS); - proc->stack = (cpustack_t *)proc; + proc = (Process *)(stack_base + stack_size / sizeof(cpu_stack_t) - PROC_SIZE_WORDS); + // On some architecture stack should be aligned, so we do it. + proc->stack = (cpu_stack_t *)((uintptr_t)proc - ((uintptr_t)proc % sizeof(cpu_aligned_stack_t))); if (CPU_SP_ON_EMPTY_SLOT) proc->stack--; } + /* Ensure stack is aligned */ + ASSERT((uintptr_t)proc->stack % sizeof(cpu_aligned_stack_t) == 0); + stack_size -= PROC_SIZE_WORDS * sizeof(cpu_stack_t); proc_init_struct(proc); proc->user_data = data; @@ -222,22 +235,14 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry) getcontext(&proc->context); proc->context.uc_stack.ss_sp = proc->stack; - proc->context.uc_stack.ss_size = stack_size - PROC_SIZE_WORDS - 1; + proc->context.uc_stack.ss_size = stack_size - 1; proc->context.uc_link = NULL; makecontext(&proc->context, (void (*)(void))proc_entry, 1, entry); #else // !CONFIG_KERN_PREEMPT - { - size_t i; - - /* Initialize process stack frame */ - CPU_PUSH_CALL_FRAME(proc->stack, proc_exit); - CPU_PUSH_CALL_FRAME(proc->stack, entry); - - /* Push a clean set of CPU registers for asm_switch_context() */ - for (i = 0; i < CPU_SAVED_REGS_CNT; i++) - CPU_PUSH_WORD(proc->stack, CPU_REG_INIT_VALUE(i)); - } + + CPU_CREATE_NEW_STACK(proc->stack, entry, proc_exit); + #endif // CONFIG_KERN_PREEMPT #if CONFIG_KERN_MONITOR @@ -311,9 +316,9 @@ void proc_setPri(struct Process *proc, int pri) if (proc != CurrentProcess) { - //proc_forbid(); - //TODO: re-enqueue process - //pric_permit(); + proc_forbid(); + ATOMIC(sched_reenqueue(proc)); + proc_permit(); } } #endif // CONFIG_KERN_PRI @@ -354,19 +359,11 @@ void proc_exit(void) #endif /* ARCH_EMUL */ CurrentProcess = NULL; - proc_schedule(); + proc_switch(); /* not reached */ } -/** - * Get the pointer to the current process - */ -struct Process *proc_current(void) -{ - return CurrentProcess; -} - /** * Get the pointer to the user data of the current process */