X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fmonitor.c;h=c055e2cee7f8896ffda30bb6c017f5fc121b9f5c;hb=ecc3d927e252b3fa278b5320f16364fc14d61220;hp=9630d3b392669fda4ad778578708d5221e3f96d5;hpb=6eb6ebb5ae5953a27977f0ef66a36344462b949a;p=bertos.git diff --git a/bertos/kern/monitor.c b/bertos/kern/monitor.c index 9630d3b3..c055e2ce 100644 --- a/bertos/kern/monitor.c +++ b/bertos/kern/monitor.c @@ -83,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; @@ -101,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); @@ -117,7 +116,7 @@ void monitor_report(void) Node *node; int i; - kprintf("%-8s%-8s%-8s%-8s %s\n", "TCB", "SPbase", "SPsize", "SPfree", "Name"); + kprintf("%-9s%-9s%-9s%-9s%s\n", "TCB", "SPbase", "SPsize", "SPfree", "Name"); for (i = 0; i < 56; i++) kputchar('-'); kputchar('\n'); @@ -127,7 +126,7 @@ void monitor_report(void) { Process *p = containerof(node, Process, monitor.link); size_t free = monitor_checkStack(p->stack_base, p->stack_size); - kprintf("%-8p%-8p%-8zu%-8zu %s\n", + kprintf("%-9p%-9p%-9zu%-9zu%s\n", p, p->stack_base, p->stack_size, free, p->monitor.name); } proc_permit();