X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fproc.c;h=a9e956243a2677267449f74241541f87f0e55862;hb=2535cb94ec2183791128f8bbd109ca69a960cf78;hp=dda2b018c180e8891af2c6660ce4485eb653046a;hpb=680ecaecd7ed77d044fbf333ce97e533b04bbfa3;p=bertos.git diff --git a/kern/proc.c b/kern/proc.c old mode 100755 new mode 100644 index dda2b018..a9e95624 --- a/kern/proc.c +++ b/kern/proc.c @@ -1,9 +1,34 @@ -/*! +/** * \file * * * \brief Simple realtime multitasking scheduler. @@ -15,89 +40,22 @@ * \author Stefano Fedrigo */ -/*#* - *#* $Log$ - *#* Revision 1.23 2004/12/13 12:07:06 bernie - *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE. - *#* - *#* Revision 1.22 2004/12/13 11:51:08 bernie - *#* DISABLE_INTS/ENABLE_INTS: Convert to IRQ_DISABLE/IRQ_ENABLE. - *#* - *#* Revision 1.21 2004/11/28 23:20:25 bernie - *#* Remove obsolete INITLIST macro. - *#* - *#* Revision 1.20 2004/11/16 22:37:14 bernie - *#* Replace IPTR with iptr_t. - *#* - *#* Revision 1.19 2004/10/19 11:47:39 bernie - *#* Kill warnings when !CONFIG_PROC_MONITOR. - *#* - *#* Revision 1.18 2004/10/19 08:54:43 bernie - *#* Initialize forbid_cnt; Formatting/comments fixes. - *#* - *#* Revision 1.17 2004/10/19 08:47:13 bernie - *#* proc_rename(), proc_forbid(), proc_permit(): New functions. - *#* - *#* Revision 1.16 2004/10/03 20:39:28 bernie - *#* Import changes from sc/firmware. - *#* - *#* Revision 1.15 2004/09/20 03:29:39 bernie - *#* C++ fixes. - *#* - *#* Revision 1.14 2004/09/14 21:06:44 bernie - *#* Use debug.h instead of kdebug.h. - *#* - *#* Revision 1.13 2004/08/29 21:58:53 bernie - *#* Include macros.h explicityl. - *#* - *#* Revision 1.11 2004/08/24 16:09:08 bernie - *#* Add missing header. - *#* - *#* Revision 1.10 2004/08/24 16:07:01 bernie - *#* Use kputs()/kputchar() when possible. - *#* - *#* Revision 1.9 2004/08/24 14:26:57 bernie - *#* monitor_debug_stacks(): Conditionally compile on CONFIG_KERN_MONITOR. - *#* - *#* Revision 1.8 2004/08/14 19:37:57 rasky - *#* Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc. - *#* - *#* Revision 1.7 2004/08/02 20:20:29 aleph - *#* Merge from project_ks - *#* - *#* Revision 1.6 2004/07/30 14:24:16 rasky - *#* Task switching con salvataggio perfetto stato di interrupt (SR) - *#* Kernel monitor per dump informazioni su stack dei processi - *#* - *#* Revision 1.5 2004/07/14 14:18:09 rasky - *#* Merge da SC: Rimosso timer dentro il task, che è uno spreco di memoria per troppi task - *#* - *#* Revision 1.4 2004/07/13 19:21:28 aleph - *#* Avoid warning for unused arg when compiled without some CONFIG_KERN_xx options - *#* - *#* Revision 1.3 2004/06/06 18:37:57 bernie - *#* Rename event macros to look like regular functions. - *#* - *#* Revision 1.2 2004/06/03 11:27:09 bernie - *#* Add dual-license information. - *#* - *#* Revision 1.1 2004/05/23 17:27:00 bernie - *#* Import kern/ subdirectory. - *#* - *#*/ #include "proc_p.h" #include "proc.h" -#include "cpu.h" -#include "event.h" -#include "hw.h" -#include -#include /* ARCH_EMUL */ -#include /* ABS() */ +//#include "hw.h" +#include +#include +#include +#include +#include +#include +#include /* ARCH_EMUL */ +#include /* ABS() */ #include /* memset() */ -/*! +/** * CPU dependent context switching routines. * * \note This function *MUST* preserve also the status of the interrupts. @@ -130,7 +88,7 @@ uint16_t Quantum; extern List StackFreeList; #endif -/*! The main process (the one that executes main()). */ +/** The main process (the one that executes main()). */ struct Process MainProcess; @@ -152,6 +110,7 @@ static void proc_init_struct(Process *proc) #endif } +MOD_DEFINE(proc); void proc_init(void) { @@ -170,19 +129,19 @@ void proc_init(void) /* Make sure the assembly routine is up-to-date with us */ ASSERT(asm_switch_version() == 1); + 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 stacksize, cpustack_t *stack_base) +struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(void), iptr_t data, size_t stacksize, cpustack_t *stack_base) { Process *proc; - cpuflags_t flags; size_t i; size_t proc_size_words = ROUND2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t); #if CONFIG_KERN_HEAP @@ -191,16 +150,16 @@ struct Process *proc_new_with_name(UNUSED(const char*, name), void (*entry)(void #if (ARCH & ARCH_EMUL) /* Ignore stack provided by caller and use the large enough default instead. */ - stack_base = (cpustack_t *)StackFreeList.head; - REMOVE((Node *)stack_base); - stacksize = DEF_STACKSIZE; + stack_base = (cpustack_t *)LIST_HEAD(&StackFreeList); + REMOVE(LIST_HEAD(&StackFreeList)); + stacksize = CONFIG_PROC_DEFSTACKSIZE; #elif CONFIG_KERN_HEAP /* Did the caller provide a stack for us? */ if (!stack_base) { /* Did the caller specify the desired stack size? */ if (!stacksize) - stacksize = CONFIG_KERN_DEFSTACKSIZE + sizeof(Process); + stacksize = CONFIG_PROC_DEFSTACKSIZE + sizeof(Process); /* Allocate stack dinamically */ if (!(stack_base = heap_alloc(stacksize))) @@ -263,7 +222,7 @@ struct Process *proc_new_with_name(UNUSED(const char*, name), void (*entry)(void return proc; } -/*! Rename a process */ +/** Rename a process */ void proc_rename(struct Process *proc, const char *name) { #if CONFIG_KERN_MONITOR @@ -274,7 +233,7 @@ void proc_rename(struct Process *proc, const char *name) } -/*! +/** * System scheduler: pass CPU control to the next process in * the ready queue. * @@ -284,19 +243,20 @@ void proc_rename(struct Process *proc, const char *name) */ void proc_schedule(void) { - /* This function must not have any "auto" variables, otherwise - * the compiler might put them on the stack of the process - * being switched out. - */ - static struct Process *old_process; - static cpuflags_t flags; + struct Process *old_process; + cpuflags_t flags; /* Remember old process to save its context later */ old_process = CurrentProcess; +#ifdef IRQ_RUNNING + /* Scheduling in interrupts is a nono. */ + ASSERT(!IRQ_RUNNING()); +#endif + /* Poll on the ready queue for the first ready process */ IRQ_SAVE_DISABLE(flags); - while (!(CurrentProcess = (struct Process *)REMHEAD(&ProcReadyList))) + while (!(CurrentProcess = (struct Process *)list_remHead(&ProcReadyList))) { /* * Make sure we physically reenable interrupts here, no matter what @@ -304,12 +264,18 @@ void proc_schedule(void) * are idle-spinning, we must allow interrupts, otherwise no * process will ever wake up. * + * During idle-spinning, can occur an interrupt, it may be able to + * modify \p ProcReadyList. To ensure that compiler reload this + * variable every while cycle we call CPU_MEMORY_BARRIER. + * The memory barrier ensure that all variables used in this context + * are reloaded. * \todo If there was a way to write sig_wait() so that it does not * disable interrupts while waiting, there would not be any * reason to do this. */ IRQ_ENABLE; - SCHEDULER_IDLE; + CPU_IDLE; + MEMORY_BARRIER; IRQ_DISABLE; } IRQ_RESTORE(flags); @@ -320,7 +286,7 @@ void proc_schedule(void) */ if (CurrentProcess != old_process) { - static cpustack_t *dummy; + cpustack_t *dummy; #if CONFIG_KERN_PREEMPTIVE /* Reset quantum for this process */ @@ -341,13 +307,18 @@ void proc_schedule(void) } -/*! +/** * Terminate the current process */ void proc_exit(void) { +#if CONFIG_KERN_MONITOR + monitor_remove(CurrentProcess); +#endif + #if CONFIG_KERN_HEAP - /* The following code is BROKEN. + /* + * The following code is BROKEN. * We are freeing our own stack before entering proc_schedule() * BAJO: A correct fix would be to rearrange the scheduler with * an additional parameter which frees the old stack/process @@ -359,34 +330,30 @@ void proc_exit(void) #endif #if (ARCH & ARCH_EMUL) -#error This is wrong +#warning This is wrong /* Reinsert process stack in free list */ ADDHEAD(&StackFreeList, (Node *)(CurrentProcess->stack - - (DEF_STACKSIZE / sizeof(cpustack_t)))); + - (CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t)))); - /* NOTE: At this point the first two words of what used + /* + * NOTE: At this point the first two words of what used * to be our stack contain a list node. From now on, we * rely on the compiler not reading/writing the stack. */ #endif /* ARCH_EMUL */ -#if CONFIG_KERN_MONITOR - monitor_remove(CurrentProcess); -#endif - CurrentProcess = NULL; proc_schedule(); /* not reached */ } -/*! +/** * Co-operative context switch */ void proc_switch(void) { - /* Just like proc_schedule, this function must not have auto variables. */ - static cpuflags_t flags; + cpuflags_t flags; IRQ_SAVE_DISABLE(flags); SCHED_ENQUEUE(CurrentProcess); @@ -396,7 +363,7 @@ void proc_switch(void) } -/*! +/** * Get the pointer to the current process */ struct Process *proc_current(void) @@ -404,7 +371,7 @@ struct Process *proc_current(void) return CurrentProcess; } -/*! +/** * Get the pointer to the user data of the current process */ iptr_t proc_current_user_data(void) @@ -415,7 +382,7 @@ iptr_t proc_current_user_data(void) #if CONFIG_KERN_PREEMPTIVE -/*! +/** * Disable preemptive task switching. * * The scheduler maintains a per-process nesting counter. Task switching is @@ -435,7 +402,7 @@ void proc_forbid(void) ++CurrentProcess->forbid_cnt; } -/*! +/** * Re-enable preemptive task switching. * * \sa proc_forbid() @@ -447,62 +414,3 @@ void proc_permit(void) } #endif /* CONFIG_KERN_PREEMPTIVE */ - - -#if 0 /* Simple testcase for the scheduler */ - -#include - -/*! - * Proc scheduling test subthread 1 - */ -static void NORETURN proc_test_thread1(void) -{ - for (;;) - { - kputs(">task 1\n"); - timer_delay(50); - proc_switch(); - } -} - -/*! - * Proc scheduling test subthread 2 - */ -static void NORETURN proc_test_thread2(void) -{ - for (;;) - { - kputs(">task 2\n"); - timer_delay(75); - proc_switch(); - } -} - -static cpustack_t proc_test_stack1[CONFIG_KERN_DEFSTACKSIZE/sizeof(cpustack_t)]; -static cpustack_t proc_test_stack2[CONFIG_KERN_DEFSTACKSIZE/sizeof(cpustack_t)]; - -/*! - * Proc scheduling test - */ -void NORETURN proc_test(void) -{ - proc_new(proc_test_thread1, NULL, sizeof(proc_test_stack1), proc_test_stack1); - proc_new(proc_test_thread2, NULL, sizeof(proc_test_stack2), proc_test_stack2); - kputs("Created tasks\n"); - - kputs("stack1:\n"); - kdump(proc_test_stack1+sizeof(proc_test_stack1)-64, 64); - kputs("stack2:\n"); - kdump(proc_test_stack2+sizeof(proc_test_stack1)-64, 64); - - for (;;) - { - kputs(">main task\n"); - timer_delay(93); - proc_switch(); - } - - ASSERT(false); -} -#endif