X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fproc.c;h=23a2c3effcfa05e247484f808a598662b248581c;hb=753d17c6975a0edd44fd771f1af01d95a61d292a;hp=e25cb7dd92c2d755ba58a0be4f1f2d94a428a456;hpb=00e009957d70dab15575ab310ed83f0b78cc8656;p=bertos.git diff --git a/kern/proc.c b/kern/proc.c old mode 100755 new mode 100644 index e25cb7dd..23a2c3ef --- a/kern/proc.c +++ b/kern/proc.c @@ -1,9 +1,34 @@ -/*! +/** * \file * * * \brief Simple realtime multitasking scheduler. @@ -17,6 +42,39 @@ /*#* *#* $Log$ + *#* Revision 1.32 2006/09/20 14:19:23 marco + *#* Restored test. + *#* + *#* Revision 1.31 2006/07/19 12:56:27 bernie + *#* Convert to new Doxygen style. + *#* + *#* Revision 1.30 2006/03/27 04:49:23 bernie + *#* CPU_IDLE(): Fix for new emulator. + *#* + *#* Revision 1.29 2006/02/24 01:17:05 bernie + *#* Update for new emulator. + *#* + *#* Revision 1.28 2006/02/21 16:06:55 bernie + *#* Cleanup/update process scheduling. + *#* + *#* Revision 1.27 2005/11/04 16:20:02 bernie + *#* Fix reference to README.devlib in header. + *#* + *#* Revision 1.26 2005/04/11 19:10:28 bernie + *#* Include top-level headers from cfg/ subdir. + *#* + *#* Revision 1.25 2005/03/15 00:20:54 bernie + *#* proc_schedule(): New sanity check. + *#* + *#* Revision 1.24 2005/01/08 09:20:54 bernie + *#* Remove unused variable. + *#* + *#* 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. *#* @@ -82,16 +140,16 @@ #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 /* ARCH_EMUL */ +#include /* ABS() */ #include /* memset() */ -/*! +/** * CPU dependent context switching routines. * * \note This function *MUST* preserve also the status of the interrupts. @@ -124,7 +182,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; @@ -167,16 +225,15 @@ void proc_init(void) } -/*! +/** * 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 @@ -185,9 +242,9 @@ 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_KERN_DEFSTACKSIZE; #elif CONFIG_KERN_HEAP /* Did the caller provide a stack for us? */ if (!stack_base) @@ -248,9 +305,7 @@ struct Process *proc_new_with_name(UNUSED(const char*, name), void (*entry)(void CPU_PUSH_WORD(proc->stack, CPU_REG_INIT_VALUE(i)); /* Add to ready list */ - DISABLE_IRQSAVE(flags); - SCHED_ENQUEUE(proc); - ENABLE_IRQRESTORE(flags); + ATOMIC(SCHED_ENQUEUE(proc)); #if CONFIG_KERN_MONITOR monitor_add(proc, name, stack_base, stacksize); @@ -259,7 +314,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 @@ -270,7 +325,7 @@ void proc_rename(struct Process *proc, const char *name) } -/*! +/** * System scheduler: pass CPU control to the next process in * the ready queue. * @@ -284,15 +339,20 @@ void proc_schedule(void) * the compiler might put them on the stack of the process * being switched out. */ - static Process *old_process; + static struct Process *old_process; static 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 */ - DISABLE_IRQSAVE(flags); - while (!(CurrentProcess = (struct Process*)REMHEAD(&ProcReadyList))) + IRQ_SAVE_DISABLE(flags); + while (!(CurrentProcess = (struct Process *)list_remHead(&ProcReadyList))) { /* * Make sure we physically reenable interrupts here, no matter what @@ -300,22 +360,23 @@ void proc_schedule(void) * are idle-spinning, we must allow interrupts, otherwise no * process will ever wake up. * - * \todo If there was a way to code sig_wait so that it does not + * \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. */ - ENABLE_INTS; - SCHEDULER_IDLE; - DISABLE_INTS; + IRQ_ENABLE; + CPU_IDLE; + IRQ_DISABLE; } - ENABLE_IRQRESTORE(flags); + IRQ_RESTORE(flags); - /* Optimization: don't switch contexts when the active + /* + * Optimization: don't switch contexts when the active * process has not changed. */ if (CurrentProcess != old_process) { - static cpustack_t* dummy; + static cpustack_t *dummy; #if CONFIG_KERN_PREEMPTIVE /* Reset quantum for this process */ @@ -336,13 +397,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 @@ -354,28 +420,25 @@ 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_KERN_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) @@ -383,15 +446,15 @@ void proc_switch(void) /* Just like proc_schedule, this function must not have auto variables. */ static cpuflags_t flags; - DISABLE_IRQSAVE(flags); + IRQ_SAVE_DISABLE(flags); SCHED_ENQUEUE(CurrentProcess); - ENABLE_IRQRESTORE(flags); + IRQ_RESTORE(flags); proc_schedule(); } -/*! +/** * Get the pointer to the current process */ struct Process *proc_current(void) @@ -399,7 +462,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) @@ -410,7 +473,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 @@ -430,7 +493,7 @@ void proc_forbid(void) ++CurrentProcess->forbid_cnt; } -/*! +/** * Re-enable preemptive task switching. * * \sa proc_forbid() @@ -442,62 +505,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