X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fmonitor.c;h=8da306771b927778a3ff8b3823554259d2b4b339;hb=32d1445272120a254d77ce8d1af1f527da7a2c17;hp=c055e2cee7f8896ffda30bb6c017f5fc121b9f5c;hpb=b02d687548283f86fd32a7def920a2558be07faf;p=bertos.git

diff --git a/bertos/kern/monitor.c b/bertos/kern/monitor.c
index c055e2ce..8da30677 100644
--- a/bertos/kern/monitor.c
+++ b/bertos/kern/monitor.c
@@ -42,18 +42,20 @@
 #if CONFIG_KERN_MONITOR
 
 #include "proc_p.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 */
-#include <cfg/macros.h>
-#include <cfg/debug.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);
@@ -78,17 +80,17 @@ 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);
+	end = stack_base + stack_size / sizeof(cpu_stack_t);
 	inc = +1;
 
 	if (CPU_STACK_GROWS_UPWARD)
@@ -106,7 +108,7 @@ size_t monitor_checkStack(cpustack_t *stack_base, size_t stack_size)
 		cur += inc;
 	}
 
-	sp_free = ABS(cur - beg) * sizeof(cpustack_t);
+	sp_free = ABS(cur - beg) * sizeof(cpu_stack_t);
 	return sp_free;
 }
 
@@ -116,12 +118,12 @@ void monitor_report(void)
 	Node *node;
 	int i;
 
+	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);
@@ -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 */