X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fmonitor.c;h=96b563e1830ff3bc852a8883d80a89bb1581ad46;hb=2535cb94ec2183791128f8bbd109ca69a960cf78;hp=907487b133a741c15b315ee4fc9cbb7205da0215;hpb=00e009957d70dab15575ab310ed83f0b78cc8656;p=bertos.git

diff --git a/kern/monitor.c b/kern/monitor.c
old mode 100755
new mode 100644
index 907487b1..96b563e1
--- a/kern/monitor.c
+++ b/kern/monitor.c
@@ -1,8 +1,33 @@
-/*!
+/**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * 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/)
- * This file is part of DevLib - See devlib/README for information.
+ *
  * -->
  *
  * \brief Monitor to check for stack overflows
@@ -12,24 +37,6 @@
  * \author Giovanni Bajo <rasky@develer.com>
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.3  2004/11/28 23:20:25  bernie
- *#* Remove obsolete INITLIST macro.
- *#*
- *#* Revision 1.2  2004/10/26 09:01:15  bernie
- *#* monitor_rename(): New function.
- *#*
- *#* Revision 1.1  2004/10/03 20:39:03  bernie
- *#* Import in DevLib.
- *#*
- *#* Revision 1.2  2004/10/03 20:36:43  bernie
- *#* Use debug.h instead of drv/kdebug.h; Misc spacing/header fixes.
- *#*
- *#* Revision 1.1  2004/09/30 23:19:30  rasky
- *#* Estratto il monitor degli stack da proc.c in due file a parte: monitor.c/h
- *#* Rinominata monitor_debug_stacks in monitor_report
- *#*/
 
 #include "monitor.h"
 
@@ -39,8 +46,8 @@
 #include <mware/list.h>
 #include <drv/timer.h>
 #include <kern/proc.h>
-#include <macros.h>
-#include <debug.h>
+#include <cfg/macros.h>
+#include <cfg/debug.h>
 
 
 static List MonitorProcs;
@@ -72,10 +79,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 *)((intptr_t)(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;
@@ -114,45 +122,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%-8lu%-8lu\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 %u chars\n",
+						p->monitor.name, (unsigned int)free);
 
 			timer_delay(500);
 		}