X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fproc.c;h=e25cb7dd92c2d755ba58a0be4f1f2d94a428a456;hb=00e009957d70dab15575ab310ed83f0b78cc8656;hp=6ce3071aaf104379519f69e74ec7f799ac1c5424;hpb=22240d0455c6bd837fe928b29068e795be3febae;p=bertos.git diff --git a/kern/proc.c b/kern/proc.c index 6ce3071a..e25cb7dd 100755 --- a/kern/proc.c +++ b/kern/proc.c @@ -15,46 +15,89 @@ * \author Stefano Fedrigo */ -/* - * $Log$ - * 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. - * - */ +/*#* + *#* $Log$ + *#* 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 "cpu.h" #include "proc_p.h" #include "proc.h" +#include "cpu.h" #include "event.h" #include "hw.h" -#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. +/*! + * CPU dependent context switching routines. + * + * \note This function *MUST* preserve also the status of the interrupts. */ -extern void asm_switch_context(cpustack_t **new_sp, cpustack_t **save_sp); -extern int asm_switch_version(void); +EXTERN_C void asm_switch_context(cpustack_t **new_sp, cpustack_t **save_sp); +EXTERN_C int asm_switch_version(void); /* * The scheduer tracks ready and waiting processes @@ -81,92 +124,23 @@ 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; -#if CONFIG_KERN_MONITOR -List MonitorProcs; - -static void monitor_init(void) -{ - INITLIST(&MonitorProcs); -} - -static void monitor_add(Process* proc, cpustack_t* stack_base, size_t stack_size) +static void proc_init_struct(Process *proc) { - proc->monitor.stack_base = stack_base; - proc->monitor.stack_size = stack_size; - - ADDTAIL(&MonitorProcs, &proc->monitor.link); -} - -static void monitor_remove(Process* proc) -{ - REMOVE(&proc->monitor.link); -} - -#define MONITOR_NODE_TO_PROCESS(node) \ - (struct Process*)((char*)(node) - offsetof(struct Process, monitor.link)) - -size_t monitor_check_stack(cpustack_t* stack_base, size_t stack_size) -{ - cpustack_t* beg; - cpustack_t* cur; - cpustack_t* end; - size_t sp_free; - - beg = stack_base; - end = stack_base + stack_size / sizeof(cpustack_t) - 1; - - if (CPU_STACK_GROWS_UPWARD) - { - cur = beg; - beg = end; - end = cur; - } - - cur = beg; - while (cur != end) - { - if (*cur != CONFIG_KERN_STACKFILLCODE) - break; - - if (CPU_STACK_GROWS_UPWARD) - cur--; - else - cur++; - } - - sp_free = ABS(cur - beg) * sizeof(cpustack_t); - return sp_free; -} - -void monitor_debug_stacks(void) -{ - struct Process* p; - - for (p = MONITOR_NODE_TO_PROCESS(MonitorProcs.head); - p->monitor.link.succ; - p = MONITOR_NODE_TO_PROCESS(p->monitor.link.succ)) - { - size_t free = monitor_check_stack(p->monitor.stack_base, p->monitor.stack_size); - kprintf("TCB: %x sp_base: %x sp_size: %x sp_free: %x\n", (uint16_t)p, (uint16_t)p->monitor.stack_base, (uint16_t)p->monitor.stack_size, (uint16_t)free); - } -} - -#endif - - -static void proc_init_struct(Process* proc) -{ - /* Avoid warning for unused argument */ + /* Avoid warning for unused argument. */ (void)proc; #if CONFIG_KERN_SIGNALS proc->sig_recv = 0; #endif +#if CONFIG_KERN_PREEMPTIVE + proc->forbid_cnt = 0; +#endif + #if CONFIG_KERN_HEAP proc->flags = 0; #endif @@ -175,7 +149,7 @@ static void proc_init_struct(Process* proc) void proc_init(void) { - INITLIST(&ProcReadyList); + LIST_INIT(&ProcReadyList); #if CONFIG_KERN_MONITOR monitor_init(); @@ -199,7 +173,7 @@ void proc_init(void) * \return Process structure of new created process * if successful, NULL otherwise. */ -Process *proc_new(void (*entry)(void), 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; @@ -210,9 +184,7 @@ Process *proc_new(void (*entry)(void), size_t stacksize, cpustack_t *stack_base) #endif #if (ARCH & ARCH_EMUL) - /* Ignore stack provided by caller - * and use the large enough default instead - */ + /* 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; @@ -258,6 +230,7 @@ Process *proc_new(void (*entry)(void), size_t stacksize, cpustack_t *stack_base) } proc_init_struct(proc); + proc->user_data = data; #if CONFIG_KERN_HEAP proc->stack_base = stack_base; @@ -280,12 +253,22 @@ Process *proc_new(void (*entry)(void), size_t stacksize, cpustack_t *stack_base) ENABLE_IRQRESTORE(flags); #if CONFIG_KERN_MONITOR - monitor_add(proc, stack_base, stacksize); + monitor_add(proc, name, stack_base, stacksize); #endif return proc; } +/*! Rename a process */ +void proc_rename(struct Process *proc, const char *name) +{ +#if CONFIG_KERN_MONITOR + monitor_rename(proc, name); +#else + (void)proc; (void)name; +#endif +} + /*! * System scheduler: pass CPU control to the next process in @@ -416,9 +399,55 @@ 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) +{ + return CurrentProcess->user_data; +} + + +#if CONFIG_KERN_PREEMPTIVE + +/*! + * Disable preemptive task switching. + * + * The scheduler maintains a per-process nesting counter. Task switching is + * effectively re-enabled only when the number of calls to proc_permit() + * matches the number of calls to proc_forbid(). + * + * Calling functions that could sleep while task switching is disabled + * is dangerous, although supported. Preemptive task switching is + * resumed while the process is sleeping and disabled again as soon as + * it wakes up again. + * + * \sa proc_permit() + */ +void proc_forbid(void) +{ + /* No need to protect against interrupts here. */ + ++CurrentProcess->forbid_cnt; +} + +/*! + * Re-enable preemptive task switching. + * + * \sa proc_forbid() + */ +void proc_permit(void) +{ + /* No need to protect against interrupts here. */ + --CurrentProcess->forbid_cnt; +} + +#endif /* CONFIG_KERN_PREEMPTIVE */ + #if 0 /* Simple testcase for the scheduler */ +#include + /*! * Proc scheduling test subthread 1 */ @@ -453,8 +482,8 @@ static cpustack_t proc_test_stack2[CONFIG_KERN_DEFSTACKSIZE/sizeof(cpustack_t)]; */ void NORETURN proc_test(void) { - proc_new(proc_test_thread1, sizeof(proc_test_stack1), proc_test_stack1); - proc_new(proc_test_thread2, sizeof(proc_test_stack2), proc_test_stack2); + 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");