X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc.c;h=6bf67a80c189e72040ae0bbc525b1b3f14fcfe51;hb=a1a1e5f2ebbf681b7cf966481a1929e0542d7c3a;hp=b49c87f3e0eb666cbf94170b103d6b836ebfb7f5;hpb=cf6017f59fb2ff71423c716ad9d9f60a1b65c7d0;p=bertos.git diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c index b49c87f3..6bf67a80 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,22 +40,27 @@ #include "proc_p.h" #include "proc.h" -#include "cfg/cfg_arch.h" /* ARCH_EMUL */ -#include "cfg/cfg_kern.h" +#include "cfg/cfg_proc.h" +#define LOG_LEVEL KERN_LOG_LEVEL +#define LOG_FORMAT KERN_LOG_FORMAT +#include + +#include "cfg/cfg_arch.h" // ARCH_EMUL +#include "cfg/cfg_monitor.h" +#include // ROUND_UP2 #include +#include // CONFIG_DEPEND() #include #include #include #include -#include /* memset() */ - -// FIXME: move somewhere -#define CONFIG_DEPEND(FEATURE, DEPS) STATIC_ASSERT(!(FEATURE) || !!(DEPS)) - -CONFIG_DEPEND(CONFIG_KERN_PRI, CONFIG_KERN_PREEMPT); +#if CONFIG_KERN_HEAP + #include +#endif +#include /* memset() */ /* * The scheduer tracks ready processes by enqueuing them in the @@ -75,11 +79,16 @@ REGISTER Process *CurrentProcess; #if (ARCH & ARCH_EMUL) /* - * In hosted environments, we must emulate the stack on the real process stack. + * In some hosted environments, we must emulate the stack on the real + * process stack to satisfy consistency checks in system libraries and + * because some ABIs place trampolines on the stack. * * Access to this list must be protected by PROC_ATOMIC(). */ -extern List StackFreeList; +List StackFreeList; + +#define NPROC 10 +cpu_stack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpu_stack_t)]; #endif /** The main process (the one that executes main()). */ @@ -93,6 +102,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 @@ -102,6 +112,7 @@ static void proc_init_struct(Process *proc) #if CONFIG_KERN_PRI proc->link.pri = 0; #endif + } MOD_DEFINE(proc); @@ -110,6 +121,12 @@ void proc_init(void) { LIST_INIT(&ProcReadyList); +#if ARCH & ARCH_EMUL + LIST_INIT(&StackFreeList); + for (int i = 0; i < NPROC; i++) + ADDTAIL(&StackFreeList, (Node *)proc_stacks[i]); +#endif + /* * We "promote" the current context into a real process. The only thing we have * to do is create a PCB and make it current. We don't need to setup the stack @@ -130,34 +147,42 @@ void proc_init(void) MOD_INIT(proc); } - /** * Create a new process, starting at the provided entry point. * + * + * \note The function + * \code + * proc_new(entry, data, stacksize, stack) + * \endcode + * is a more convenient way to create a process, as you don't have to specify + * the name. + * * \return Process structure of new created process * if successful, NULL otherwise. */ -struct Process *proc_new_with_name(UNUSED(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 = ROUND2(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 - TRACEMSG("name=%s", name); + LOG_INFO("name=%s", name); #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; + stack_size = KERN_MINSTACKSIZE; #elif CONFIG_KERN_HEAP /* Did the caller provide a stack for us? */ if (!stack_base) { /* Did the caller specify the desired stack size? */ if (!stack_size) - stack_size = CONFIG_KERN_MINSTACKSIZE; + stack_size = KERN_MINSTACKSIZE; /* Allocate stack dinamically */ if (!(stack_base = heap_alloc(stack_size))) @@ -175,8 +200,13 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi #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 */ @@ -184,17 +214,23 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi { 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; @@ -211,22 +247,14 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi 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); + CPU_CREATE_NEW_STACK(proc->stack, entry, proc_exit); - /* 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)); - } #endif // CONFIG_KERN_PREEMPT #if CONFIG_KERN_MONITOR @@ -270,6 +298,8 @@ void proc_rename(struct Process *proc, const char *name) #endif } + +#if CONFIG_KERN_PRI /** * Change the scheduling priority of a process. * @@ -298,18 +328,19 @@ 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 /** * Terminate the current process */ void proc_exit(void) { - TRACEMSG("%p:%s", CurrentProcess, proc_currentName()); + LOG_INFO("%p:%s", CurrentProcess, proc_currentName()); #if CONFIG_KERN_MONITOR monitor_remove(CurrentProcess); @@ -340,19 +371,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 */