projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: coding style fixes (structure naming)
[bertos.git]
/
bertos
/
kern
/
monitor.c
diff --git
a/bertos/kern/monitor.c
b/bertos/kern/monitor.c
index c055e2cee7f8896ffda30bb6c017f5fc121b9f5c..d0bf4a823b1bf534e17e218e262a38bd70c51a11 100644
(file)
--- a/
bertos/kern/monitor.c
+++ b/
bertos/kern/monitor.c
@@
-32,7
+32,6
@@
*
* \brief Monitor to check for stack overflows
*
*
* \brief Monitor to check for stack overflows
*
- * \version $Id$
* \author Giovanni Bajo <rasky@develer.com>
*/
* \author Giovanni Bajo <rasky@develer.com>
*/
@@
-42,18
+41,20
@@
#if CONFIG_KERN_MONITOR
#include "proc_p.h"
#if CONFIG_KERN_MONITOR
#include "proc_p.h"
+#include <cfg/macros.h>
+#include <cfg/debug.h>
+
#include <struct/list.h>
#include <struct/list.h>
+
#include <drv/timer.h>
#include <drv/timer.h>
+
#include <kern/proc.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;
/* Access to this list must be protected against the scheduler */
static List MonitorProcs;
-
void monitor_init(void)
{
LIST_INIT(&MonitorProcs);
void monitor_init(void)
{
LIST_INIT(&MonitorProcs);
@@
-78,17
+79,17
@@
void monitor_rename(Process *proc, const char *name)
proc->monitor.name = 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;
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)
inc = +1;
if (CPU_STACK_GROWS_UPWARD)
@@
-106,7
+107,7
@@
size_t monitor_checkStack(cpustack_t *stack_base, size_t stack_size)
cur += inc;
}
cur += inc;
}
- sp_free = ABS(cur - beg) * sizeof(cpustack_t);
+ sp_free = ABS(cur - beg) * sizeof(cpu
_
stack_t);
return sp_free;
}
return sp_free;
}
@@
-116,12
+117,12
@@
void monitor_report(void)
Node *node;
int i;
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');
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);
FOREACH_NODE(node, &MonitorProcs)
{
Process *p = containerof(node, Process, monitor.link);
@@
-145,7
+146,7
@@
static void NORETURN monitor(void)
Process *p = containerof(node, Process, monitor.link);
size_t free = monitor_checkStack(p->stack_base, p->stack_size);
Process *p = containerof(node, Process, monitor.link);
size_t free = monitor_checkStack(p->stack_base, p->stack_size);
- if (free < 0x20)
+ if (
p->stack_base &&
free < 0x20)
kprintf("MONITOR: Free stack of process '%s' is only %u chars\n",
p->monitor.name, (unsigned int)free);
}
kprintf("MONITOR: Free stack of process '%s' is only %u chars\n",
p->monitor.name, (unsigned int)free);
}
@@
-156,10
+157,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 */
}
#endif /* CONFIG_KERN_MONITOR */