X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fmonitor.c;h=26e2025b514dab010ec961ae298d0567a3892f5e;hb=ebd302f4820855188df16ee8422a947751bf2c50;hp=96b563e1830ff3bc852a8883d80a89bb1581ad46;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/kern/monitor.c b/bertos/kern/monitor.c
index 96b563e1..26e2025b 100644
--- a/bertos/kern/monitor.c
+++ b/bertos/kern/monitor.c
@@ -26,14 +26,13 @@
  * invalidate any other reasons why the executable file might be covered by
  * the GNU General Public License.
  *
- * Copyright 2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2004, 2008 Develer S.r.l. (http://www.develer.com/)
  *
  * -->
  *
  * \brief Monitor to check for stack overflows
  *
  * \version $Id$
- *
  * \author Giovanni Bajo <rasky@develer.com>
  */
 
@@ -43,13 +42,15 @@
 #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>
 
 
+/* Access to this list must be protected against the scheduler */
 static List MonitorProcs;
 
 
@@ -59,45 +60,41 @@ void monitor_init(void)
 }
 
 
-void monitor_add(Process* proc, const char* name, cpustack_t* stack_base, size_t stack_size)
+void monitor_add(Process *proc, const char *name)
 {
 	proc->monitor.name = name;
-	proc->monitor.stack_base = stack_base;
-	proc->monitor.stack_size = stack_size;
 
-	ADDTAIL(&MonitorProcs, &proc->monitor.link);
+	PROC_ATOMIC(ADDTAIL(&MonitorProcs, &proc->monitor.link));
 }
 
 
-void monitor_remove(Process* proc)
+void monitor_remove(Process *proc)
 {
-	REMOVE(&proc->monitor.link);
+	PROC_ATOMIC(REMOVE(&proc->monitor.link));
 }
 
-void monitor_rename(Process *proc, const char* name)
+void monitor_rename(Process *proc, const char *name)
 {
 	proc->monitor.name = name;
 }
 
-/* TODO: use containerof() */
-#define MONITOR_NODE_TO_PROCESS(node) \
-	(struct Process *)((intptr_t)(node) - offsetof(struct Process, monitor.link))
-
-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;
@@ -106,69 +103,63 @@ 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;
 }
 
 
 void monitor_report(void)
 {
-	struct Process* p;
+	Node *node;
 	int i;
 
-	if (LIST_EMPTY(&MonitorProcs))
-	{
-		kputs("No stacks registered in the monitor\n");
-		return;
-	}
-
-	kprintf("%-24s%-8s%-8s%-8s%-8s\n", "Process name", "TCB", "SPbase", "SPsize", "SPfree");
-	for (i=0;i<56;i++)
+	kprintf("%-9s%-9s%-9s%-9s%s\n", "TCB", "SPbase", "SPsize", "SPfree", "Name");
+	for (i = 0; i < 56; i++)
 		kputchar('-');
 	kputchar('\n');
 
-	for (p = MONITOR_NODE_TO_PROCESS(LIST_HEAD(&MonitorProcs));
-		 p->monitor.link.succ;
-		 p = MONITOR_NODE_TO_PROCESS(p->monitor.link.succ))
+	proc_forbid();
+	FOREACH_NODE(node, &MonitorProcs)
 	{
-		size_t free = monitor_checkStack(p->monitor.stack_base, p->monitor.stack_size);
-		kprintf("%-24s%-8p%-8p%-8lu%-8lu\n",
-			p->monitor.name, p, p->monitor.stack_base, p->monitor.stack_size, free);
+		Process *p = containerof(node, Process, monitor.link);
+		size_t free = monitor_checkStack(p->stack_base, p->stack_size);
+		kprintf("%-9p%-9p%-9zu%-9zu%s\n",
+			p, p->stack_base, p->stack_size, free, p->monitor.name);
 	}
+	proc_permit();
 }
 
 
 static void NORETURN monitor(void)
 {
-	struct Process *p;
+	Node *node;
 
-	while (1)
+	for (;;)
 	{
-		for (p = MONITOR_NODE_TO_PROCESS(LIST_HEAD(&MonitorProcs));
-			p->monitor.link.succ;
-			p = MONITOR_NODE_TO_PROCESS(p->monitor.link.succ))
+		proc_forbid();
+		FOREACH_NODE(node, &MonitorProcs)
 		{
-			size_t free = monitor_checkStack(p->monitor.stack_base, p->monitor.stack_size);
+			Process *p = containerof(node, Process, monitor.link);
+			size_t free = monitor_checkStack(p->stack_base, p->stack_size);
 
 			if (free < 0x20)
-				kprintf("MONITOR: WARNING: Free stack for process '%s' is only %u chars\n",
+				kprintf("MONITOR: Free stack of process '%s' is only %u chars\n",
 						p->monitor.name, (unsigned int)free);
-
-			timer_delay(500);
 		}
+		proc_permit();
+
+		/* Give some rest to the system */
+		timer_delay(500);
 	}
 }
 
-
-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 */