X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=kern%2Fmonitor.c;h=608a7e8d24fa1f7c834fae4e02ddb7883eb1b26f;hb=800a692eb5ebe153f814a94109dd4deaca8997ad;hp=a64fceb25874f3843334b48ac3bcfa5fea1e8eff;hpb=76c53bfa0136be55cf17e57b1ee098e5dfeefa70;p=bertos.git

diff --git a/kern/monitor.c b/kern/monitor.c
old mode 100755
new mode 100644
index a64fceb2..608a7e8d
--- a/kern/monitor.c
+++ b/kern/monitor.c
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2004 Develer S.r.l. (http://www.develer.com/)
@@ -14,6 +14,21 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.10  2006/09/20 13:58:42  marco
+ *#* Used z modifier instead l.
+ *#*
+ *#* Revision 1.9  2006/07/19 12:56:27  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.8  2006/03/22 09:49:22  bernie
+ *#* Reduce memory usage.
+ *#*
+ *#* Revision 1.7  2006/03/13 02:07:14  bernie
+ *#* Add TODO item.
+ *#*
+ *#* Revision 1.6  2006/02/24 01:17:05  bernie
+ *#* Update for new emulator.
+ *#*
  *#* Revision 1.5  2005/11/04 16:20:02  bernie
  *#* Fix reference to README.devlib in header.
  *#*
@@ -78,10 +93,11 @@ void monitor_rename(Process *proc, const char* name)
 	proc->monitor.name = name;
 }
 
+/* TODO: use containerof() */
 #define MONITOR_NODE_TO_PROCESS(node) \
-	(struct Process*)((char*)(node) - offsetof(struct Process, monitor.link))
+	(struct Process *)((char *)(node) - offsetof(struct Process, monitor.link))
 
-size_t monitor_check_stack(cpustack_t* stack_base, size_t stack_size)
+size_t monitor_checkStack(cpustack_t* stack_base, size_t stack_size)
 {
 	cpustack_t* beg;
 	cpustack_t* cur;
@@ -120,45 +136,43 @@ void monitor_report(void)
 	struct Process* p;
 	int i;
 
-	if (ISLISTEMPTY(&MonitorProcs))
+	if (LIST_EMPTY(&MonitorProcs))
 	{
 		kputs("No stacks registered in the monitor\n");
 		return;
 	}
 
-	kprintf("%-24s    %-6s%-8s%-8s%-8s\n", "Process name", "TCB", "SPbase", "SPsize", "SPfree");
+	kprintf("%-24s%-8s%-8s%-8s%-8s\n", "Process name", "TCB", "SPbase", "SPsize", "SPfree");
 	for (i=0;i<56;i++)
 		kputchar('-');
 	kputchar('\n');
 
-	for (p = MONITOR_NODE_TO_PROCESS(MonitorProcs.head);
+	for (p = MONITOR_NODE_TO_PROCESS(LIST_HEAD(&MonitorProcs));
 		 p->monitor.link.succ;
 		 p = MONITOR_NODE_TO_PROCESS(p->monitor.link.succ))
 	{
-		size_t free = monitor_check_stack(p->monitor.stack_base, p->monitor.stack_size);
-		kprintf("%-24s    %04x    %04x    %4x    %4x\n", p->monitor.name, (uint16_t)p, (uint16_t)p->monitor.stack_base, (uint16_t)p->monitor.stack_size, (uint16_t)free);
+		size_t free = monitor_checkStack(p->monitor.stack_base, p->monitor.stack_size);
+		kprintf("%-24s%8p%8p%8zx%8zx\n",
+			p->monitor.name, p, p->monitor.stack_base, p->monitor.stack_size, free);
 	}
 }
 
 
-static void monitor(void)
+static void NORETURN monitor(void)
 {
-	struct Process* p;
+	struct Process *p;
 
 	while (1)
 	{
-		for (p = MONITOR_NODE_TO_PROCESS(MonitorProcs.head);
+		for (p = MONITOR_NODE_TO_PROCESS(LIST_HEAD(&MonitorProcs));
 			p->monitor.link.succ;
 			p = MONITOR_NODE_TO_PROCESS(p->monitor.link.succ))
 		{
-			size_t free = monitor_check_stack(p->monitor.stack_base, p->monitor.stack_size);
+			size_t free = monitor_checkStack(p->monitor.stack_base, p->monitor.stack_size);
 
 			if (free < 0x20)
-			{
-				kprintf("MONITOR: ***************************************\n");
-				kprintf("MONITOR: WARNING: Free stack for process '%s' is only %04x chars\n", p->monitor.name, free);
-				kprintf("MONITOR: ***************************************\n\n");
-			}
+				kprintf("MONITOR: WARNING: Free stack for process '%s' is only %x chars\n",
+						p->monitor.name, free);
 
 			timer_delay(500);
 		}