X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fmonitor.c;h=0c48ed5c9d46a419735497a61a1a5dd255ea4277;hb=40c25a4b1d0f1c23478c2d681b74662de968f671;hp=1263401a3a807ffc1473b804bf0345bcda003236;hpb=444b1c1d891a14e9b70ba7043d1425ce41345675;p=bertos.git diff --git a/bertos/kern/monitor.c b/bertos/kern/monitor.c index 1263401a..0c48ed5c 100644 --- a/bertos/kern/monitor.c +++ b/bertos/kern/monitor.c @@ -42,9 +42,10 @@ #if CONFIG_KERN_MONITOR #include "proc_p.h" -#include +#include #include #include +#include /* CPU_STACK_GROWS_UPWARD */ #include #include @@ -82,16 +83,18 @@ size_t monitor_checkStack(cpustack_t *stack_base, size_t stack_size) cpustack_t *beg; cpustack_t *cur; cpustack_t *end; + int inc; size_t sp_free; + beg = stack_base; - end = stack_base + stack_size / sizeof(cpustack_t) - 1; + end = stack_base + stack_size / sizeof(cpustack_t); + inc = +1; if (CPU_STACK_GROWS_UPWARD) { - cur = beg; - beg = end; - end = cur; + SWAP(beg, end); + inc = -1; } cur = beg; @@ -100,10 +103,7 @@ size_t monitor_checkStack(cpustack_t *stack_base, size_t stack_size) if (*cur != CONFIG_KERN_STACKFILLCODE) break; - if (CPU_STACK_GROWS_UPWARD) - cur--; - else - cur++; + cur += inc; } sp_free = ABS(cur - beg) * sizeof(cpustack_t); @@ -116,8 +116,8 @@ void monitor_report(void) Node *node; int i; - kprintf("%-24s%-8s%-8s%-8s%-8s\n", "Process name", "TCB", "SPbase", "SPsize", "SPfree"); - for (i = 0; i<56; i++) + kprintf("%-8s%-8s%-8s%-8s %s\n", "TCB", "SPbase", "SPsize", "SPfree", "Name"); + for (i = 0; i < 56; i++) kputchar('-'); kputchar('\n'); @@ -126,8 +126,8 @@ void monitor_report(void) { Process *p = containerof(node, Process, monitor.link); size_t free = monitor_checkStack(p->stack_base, p->stack_size); - kprintf("%-24s%-8p%-8p%-8lu%-8lu\n", - p->monitor.name, p, p->stack_base, p->stack_size, free); + kprintf("%-8p%-8p%-8zu%-8zu %s\n", + p, p->stack_base, p->stack_size, free, p->monitor.name); } proc_permit(); } @@ -135,7 +135,6 @@ void monitor_report(void) static void NORETURN monitor(void) { - Process *p; Node *node; for (;;) @@ -143,7 +142,7 @@ static void NORETURN monitor(void) proc_forbid(); FOREACH_NODE(node, &MonitorProcs) { - p = containerof(node, Process, monitor.link); + Process *p = containerof(node, Process, monitor.link); size_t free = monitor_checkStack(p->stack_base, p->stack_size); if (free < 0x20)