projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add test ARCH; remove macros.h dependency to allow to include this file also in prepr...
[bertos.git]
/
bertos
/
kern
/
proc.c
diff --git
a/bertos/kern/proc.c
b/bertos/kern/proc.c
index b49c87f3e0eb666cbf94170b103d6b836ebfb7f5..3ee3037bbf8ed6dacdff119cd45dde88f3ec5bf0 100644
(file)
--- a/
bertos/kern/proc.c
+++ b/
bertos/kern/proc.c
@@
-30,8
+30,7
@@
* Copyright 1999, 2000, 2001, 2008 Bernie Innocenti <bernie@codewiz.org>
* -->
*
* Copyright 1999, 2000, 2001, 2008 Bernie Innocenti <bernie@codewiz.org>
* -->
*
- * \brief Simple realtime multitasking scheduler.
- * Context switching is only done cooperatively.
+ * \brief Simple cooperative multitasking scheduler.
*
* \version $Id$
* \author Bernie Innocenti <bernie@codewiz.org>
*
* \version $Id$
* \author Bernie Innocenti <bernie@codewiz.org>
@@
-44,18
+43,23
@@
#include "cfg/cfg_arch.h" /* ARCH_EMUL */
#include "cfg/cfg_kern.h"
#include <cfg/module.h>
#include "cfg/cfg_arch.h" /* ARCH_EMUL */
#include "cfg/cfg_kern.h"
#include <cfg/module.h>
+#include <cfg/depend.h> // CONFIG_DEPEND()
#include <cpu/irq.h>
#include <cpu/types.h>
#include <cpu/attr.h>
#include <cpu/frame.h>
#include <cpu/irq.h>
#include <cpu/types.h>
#include <cpu/attr.h>
#include <cpu/frame.h>
-#include <string.h> /* memset() */
+#if CONFIG_KERN_HEAP
+ #include <struct/heap.h>
+#endif
-// FIXME: move somewhere
-#define CONFIG_DEPEND(FEATURE, DEPS) STATIC_ASSERT(!(FEATURE) || !!(DEPS))
+#include <string.h> /* memset() */
-CONFIG_DEPEND(CONFIG_KERN_PRI, CONFIG_KERN_PREEMPT);
+// Check config dependencies
+CONFIG_DEPEND(CONFIG_KERN_SIGNALS, CONFIG_KERN_SCHED);
+CONFIG_DEPEND(CONFIG_KERN_SEMAPHORES, CONFIG_KERN_SIGNALS);
+CONFIG_DEPEND(CONFIG_KERN_MONITOR, CONFIG_KERN_SCHED);
/*
/*
@@
-75,11
+79,16
@@
REGISTER Process *CurrentProcess;
#if (ARCH & ARCH_EMUL)
/*
#if (ARCH & ARCH_EMUL)
/*
- * In hosted environments, we must emulate the stack on the real process stack.
+ * In some hosted environments, we must emulate the stack on the real
+ * process stack to satisfy consistency checks in system libraries and
+ * because some ABIs place trampolines on the stack.
*
* Access to this list must be protected by PROC_ATOMIC().
*/
*
* Access to this list must be protected by PROC_ATOMIC().
*/
-extern List StackFreeList;
+List StackFreeList;
+
+#define NPROC 8
+cpustack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpustack_t)];
#endif
/** The main process (the one that executes main()). */
#endif
/** The main process (the one that executes main()). */
@@
-110,6
+119,12
@@
void proc_init(void)
{
LIST_INIT(&ProcReadyList);
{
LIST_INIT(&ProcReadyList);
+#if ARCH & ARCH_EMUL
+ LIST_INIT(&StackFreeList);
+ for (int i = 0; i < NPROC; i++)
+ ADDTAIL(&StackFreeList, (Node *)proc_stacks[i]);
+#endif
+
/*
* We "promote" the current context into a real process. The only thing we have
* to do is create a PCB and make it current. We don't need to setup the stack
/*
* We "promote" the current context into a real process. The only thing we have
* to do is create a PCB and make it current. We don't need to setup the stack
@@
-130,17
+145,16
@@
void proc_init(void)
MOD_INIT(proc);
}
MOD_INIT(proc);
}
-
/**
* Create a new process, starting at the provided entry point.
*
* \return Process structure of new created process
* if successful, NULL otherwise.
*/
/**
* Create a new process, starting at the provided entry point.
*
* \return Process structure of new created process
* if successful, NULL otherwise.
*/
-struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(void), iptr_t data, size_t stack_size, cpustack_t *stack_base)
+struct Process *proc_new_with_name(UNUSED
_ARG
(const char *, name), void (*entry)(void), iptr_t data, size_t stack_size, cpustack_t *stack_base)
{
Process *proc;
{
Process *proc;
- const size_t PROC_SIZE_WORDS = ROUND2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t);
+ const size_t PROC_SIZE_WORDS = ROUND
_UP
2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t);
#if CONFIG_KERN_HEAP
bool free_stack = false;
#endif
#if CONFIG_KERN_HEAP
bool free_stack = false;
#endif
@@
-270,6
+284,8
@@
void proc_rename(struct Process *proc, const char *name)
#endif
}
#endif
}
+
+#if CONFIG_KERN_PRI
/**
* Change the scheduling priority of a process.
*
/**
* Change the scheduling priority of a process.
*
@@
-303,6
+319,7
@@
void proc_setPri(struct Process *proc, int pri)
//pric_permit();
}
}
//pric_permit();
}
}
+#endif // CONFIG_KERN_PRI
/**
* Terminate the current process
/**
* Terminate the current process
@@
-340,7
+357,7
@@
void proc_exit(void)
#endif /* ARCH_EMUL */
CurrentProcess = NULL;
#endif /* ARCH_EMUL */
CurrentProcess = NULL;
- proc_s
chedule
();
+ proc_s
witch
();
/* not reached */
}
/* not reached */
}