Merge branch "preempt" in "trunk".

[bertos.git] / bertos / kern / monitor.c

diff --git a/bertos/kern/monitor.c b/bertos/kern/monitor.c
index d46c750a0ed14540bf9aa4cf2f3fa4af75d02a80..8da306771b927778a3ff8b3823554259d2b4b339 100644 (file)
--- a/bertos/kern/monitor.c
+++ b/bertos/kern/monitor.c
@@ -42,17 +42,20 @@
 #if CONFIG_KERN_MONITOR
 
 #include "proc_p.h"
-#include <mware/list.h>
-#include <drv/timer.h>
-#include <kern/proc.h>
 #include <cfg/macros.h>
 #include <cfg/debug.h>
 
+#include <struct/list.h>
+
+#include <drv/timer.h>
+
+#include <kern/proc.h>
+
+#include <cpu/frame.h> /* CPU_STACK_GROWS_UPWARD */
 
 /* Access to this list must be protected against the scheduler */
 static List MonitorProcs;
 
-
 void monitor_init(void)
 {
        LIST_INIT(&MonitorProcs);
@@ -77,21 +80,23 @@ void monitor_rename(Process *proc, const char *name)
        proc->monitor.name = name;
 }
 
-size_t monitor_checkStack(cpustack_t *stack_base, size_t stack_size)
+size_t monitor_checkStack(cpu_stack_t *stack_base, size_t stack_size)
 {
-       cpustack_t *beg;
-       cpustack_t *cur;
-       cpustack_t *end;
+       cpu_stack_t *beg;
+       cpu_stack_t *cur;
+       cpu_stack_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(cpu_stack_t);
+       inc = +1;
 
        if (CPU_STACK_GROWS_UPWARD)
        {
-               cur = beg;
-               beg = end;
-               end = cur;
+               SWAP(beg, end);
+               inc = -1;
        }
 
        cur = beg;
@@ -100,13 +105,10 @@ 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);
+       sp_free = ABS(cur - beg) * sizeof(cpu_stack_t);
        return sp_free;
 }
 
@@ -116,17 +118,17 @@ void monitor_report(void)
        Node *node;
        int i;
 
-       kprintf("%-8s%-8s%-8s%-8s %s\n", "TCB", "SPbase", "SPsize", "SPfree", "Name");
+       proc_forbid();
+       kprintf("%-9s%-9s%-9s%-9s%s\n", "TCB", "SPbase", "SPsize", "SPfree", "Name");
        for (i = 0; i < 56; i++)
                kputchar('-');
        kputchar('\n');
 
-       proc_forbid();
        FOREACH_NODE(node, &MonitorProcs)
        {
                Process *p = containerof(node, Process, monitor.link);
                size_t free = monitor_checkStack(p->stack_base, p->stack_size);
-               kprintf("%-8p%-8p%-8lu%-8lu %s\n",
+               kprintf("%-9p%-9p%-9zu%-9zu%s\n",
                        p, p->stack_base, p->stack_size, free, p->monitor.name);
        }
        proc_permit();
@@ -156,10 +158,10 @@ static void NORETURN monitor(void)
        }
 }
 
-
-void monitor_start(size_t stacksize, cpustack_t *stack)
+void monitor_start(size_t stacksize, cpu_stack_t *stack)
 {
-       proc_new(monitor, NULL, stacksize, stack);
+       struct Process *p = proc_new(monitor, NULL, stacksize, stack);
+       proc_setPri(p, -10);
 }
 
 #endif /* CONFIG_KERN_MONITOR */