X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fproc.c;h=975278b4b8192a430ef4c865e9d1c4c1d2a2e500;hb=59f756174ecfff7ac9435ba62f7dc0aa636b73bd;hp=74ba6151f167b45632757db513b4ec21f22c7ae1;hpb=f2d3a3f1b413d468142830b9dc7a088e1d3e7afb;p=bertos.git diff --git a/kern/proc.c b/kern/proc.c index 74ba6151..975278b4 100755 --- a/kern/proc.c +++ b/kern/proc.c @@ -15,52 +15,74 @@ * \author Stefano Fedrigo */ -/* - * $Log$ - * 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. - * - */ +/*#* + *#* $Log$ + *#* 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 @@ -91,96 +113,6 @@ extern List StackFreeList; struct Process MainProcess; -#if CONFIG_KERN_MONITOR -List MonitorProcs; - -static void monitor_init(void) -{ - INITLIST(&MonitorProcs); -} - -static void monitor_add(Process* proc, const char* name, cpustack_t* stack_base, size_t stack_size) -{ - proc->monitor.name = name; - 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; -} - -#if CONFIG_KERN_MONITOR - -void monitor_debug_stacks(void) -{ - struct Process* p; - int i; - - if (ISLISTEMPTY(&MonitorProcs)) - { - kprintf("No stacks registered in the monitor\n"); - return; - } - - kprintf("%-24s %-6s%-8s%-8s%-8s\n", "Process name", "TCB", "SPbase", "SPsize", "SPfree"); - for (i=0;i<56;i++) - kprintf("-"); - kprintf("\n"); - - 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("%-24s %04x %04x %4x %4x\n", p->monitor.name, (uint16_t)p, (uint16_t)p->monitor.stack_base, (uint16_t)p->monitor.stack_size, (uint16_t)free); - } -} - -#endif /* CONFIG_KERN_MONITOR */ - -#endif - - static void proc_init_struct(Process* proc) { /* Avoid warning for unused argument */ @@ -450,6 +382,8 @@ IPTR proc_current_user_data(void) #if 0 /* Simple testcase for the scheduler */ +#include + /*! * Proc scheduling test subthread 1 */