X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc.c;h=6b1aaaff51fe97870b35a826ddaa96d4dd21d496;hb=83fc7933f968173822ed3f636d75860d4a747e76;hp=4b8f3f65a799e0d590b8c7fb03d17440b49c1ecc;hpb=40c25a4b1d0f1c23478c2d681b74662de968f671;p=bertos.git diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c index 4b8f3f65..6b1aaaff 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,17 +40,23 @@ #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() #include #include #include #include -#include /* memset() */ +#if CONFIG_KERN_HEAP + #include +#endif +#include /* memset() */ /* * The scheduer tracks ready processes by enqueuing them in the @@ -70,11 +75,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()). */ @@ -88,11 +98,17 @@ static void proc_init_struct(Process *proc) #if CONFIG_KERN_SIGNALS proc->sig_recv = 0; + proc->sig_wait = 0; #endif #if CONFIG_KERN_HEAP proc->flags = 0; #endif + +#if CONFIG_KERN_PRI + proc->link.pri = 0; +#endif + } MOD_DEFINE(proc); @@ -101,6 +117,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 @@ -121,17 +143,16 @@ void proc_init(void) MOD_INIT(proc); } - /** * Create a new process, starting at the provided entry point. * * \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 @@ -139,16 +160,17 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi #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_PROC_DEFSTACKSIZE; + stack_size = CONFIG_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_PROC_DEFSTACKSIZE + sizeof(Process); + stack_size = CONFIG_KERN_MINSTACKSIZE; /* Allocate stack dinamically */ if (!(stack_base = heap_alloc(stack_size))) @@ -156,33 +178,45 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi free_stack = true; } -#else + +#else // !ARCH_EMUL && !CONFIG_KERN_HEAP + /* Stack must have been provided by the user */ ASSERT_VALID_PTR(stack_base); ASSERT(stack_size); -#endif + +#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 */ if (CPU_STACK_GROWS_UPWARD) { - proc = (Process*)stack_base; + proc = (Process *)stack_base; proc->stack = stack_base + PROC_SIZE_WORDS; + // On some architecture stack should be aligned, so we do it. + proc->stack = (void *)proc->stack + (sizeof(cpu_aligned_stack_t) - ((long)proc->stack % sizeof(cpu_stack_aligned_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 = (void *)proc - ((long)proc % sizeof(cpu_aligned_stack_t)); if (CPU_SP_ON_EMPTY_SLOT) proc->stack--; } + stack_size = stack_size - PROC_SIZE_WORDS; proc_init_struct(proc); proc->user_data = data; @@ -196,10 +230,10 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi #endif #if CONFIG_KERN_PREEMPT - // FIXME: proc_exit + getcontext(&proc->context); - proc->context.uc_stack.ss_sp = stack_base; - proc->context.uc_stack.ss_size = stack_size; + proc->context.uc_stack.ss_sp = proc->stack; + proc->context.uc_stack.ss_size = stack_size - PROC_SIZE_WORDS - 1; proc->context.uc_link = NULL; makecontext(&proc->context, (void (*)(void))proc_entry, 1, entry); @@ -217,13 +251,13 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi } #endif // CONFIG_KERN_PREEMPT - /* Add to ready list */ - ATOMIC(SCHED_ENQUEUE(proc)); - #if CONFIG_KERN_MONITOR monitor_add(proc, name); #endif + /* Add to ready list */ + ATOMIC(SCHED_ENQUEUE(proc)); + return proc; } @@ -258,6 +292,43 @@ void proc_rename(struct Process *proc, const char *name) #endif } + +#if CONFIG_KERN_PRI +/** + * Change the scheduling priority of a process. + * + * Process piorities are signed ints, whereas a larger integer value means + * higher scheduling priority. The default priority for new processes is 0. + * The idle process runs with the lowest possible priority: INT_MIN. + * + * A process with a higher priority always preempts lower priority processes. + * Processes of equal priority share the CPU time according to a simple + * round-robin policy. + * + * As a general rule to maximize responsiveness, compute-bound processes + * should be assigned negative priorities and tight, interactive processes + * should be assigned positive priorities. + * + * To avoid interfering with system background activities such as input + * processing, application processes should remain within the range -10 + * and +10. + */ +void proc_setPri(struct Process *proc, int pri) +{ + if (proc->link.pri == pri) + return; + + proc->link.pri = pri; + + if (proc != CurrentProcess) + { + proc_forbid(); + ATOMIC(sched_reenqueue(proc)); + proc_permit(); + } +} +#endif // CONFIG_KERN_PRI + /** * Terminate the current process */ @@ -283,10 +354,8 @@ void proc_exit(void) #endif #if (ARCH & ARCH_EMUL) -#warning This is wrong /* Reinsert process stack in free list */ - PROC_ATOMIC(ADDHEAD(&StackFreeList, (Node *)(CurrentProcess->stack - - (CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t))))); + PROC_ATOMIC(ADDHEAD(&StackFreeList, (Node *)CurrentProcess->stack_base)); /* * NOTE: At this point the first two words of what used @@ -296,19 +365,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 */