X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=bertos%2Fkern%2Fmonitor.c;h=9630d3b392669fda4ad778578708d5221e3f96d5;hb=6a60d159530b29a6f60edbad42d0e31c1f1994d9;hp=1263401a3a807ffc1473b804bf0345bcda003236;hpb=444b1c1d891a14e9b70ba7043d1425ce41345675;p=bertos.git

diff --git a/bertos/kern/monitor.c b/bertos/kern/monitor.c
index 1263401a..9630d3b3 100644
--- a/bertos/kern/monitor.c
+++ b/bertos/kern/monitor.c
@@ -42,9 +42,10 @@
 #if CONFIG_KERN_MONITOR
 
 #include "proc_p.h"
-#include <mware/list.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>
 
@@ -116,8 +117,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 +127,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 +136,6 @@ void monitor_report(void)
 
 static void NORETURN monitor(void)
 {
-	Process *p;
 	Node *node;
 
 	for (;;)
@@ -143,7 +143,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)