projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add demo application.
[bertos.git]
/
kern
/
proc.c
diff --git
a/kern/proc.c
b/kern/proc.c
index 7fe9c70abc555029f5e7ce17044ab8b7713153fe..495ca735e5d2cedc650eedb4a848fb53b622e1ee 100755
(executable)
--- a/
kern/proc.c
+++ b/
kern/proc.c
@@
-17,6
+17,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.29 2006/02/24 01:17:05 bernie
+ *#* Update for new emulator.
+ *#*
+ *#* Revision 1.28 2006/02/21 16:06:55 bernie
+ *#* Cleanup/update process scheduling.
+ *#*
*#* Revision 1.27 2005/11/04 16:20:02 bernie
*#* Fix reference to README.devlib in header.
*#*
*#* Revision 1.27 2005/11/04 16:20:02 bernie
*#* Fix reference to README.devlib in header.
*#*
@@
-100,9
+106,9
@@
#include "proc_p.h"
#include "proc.h"
#include "proc_p.h"
#include "proc.h"
+//#include "hw.h"
+#include <mware/event.h>
#include <cfg/cpu.h>
#include <cfg/cpu.h>
-#include "event.h"
-#include "hw.h"
#include <cfg/debug.h>
#include <cfg/arch_config.h> /* ARCH_EMUL */
#include <cfg/macros.h> /* ABS() */
#include <cfg/debug.h>
#include <cfg/arch_config.h> /* ARCH_EMUL */
#include <cfg/macros.h> /* ABS() */
@@
-191,7
+197,7
@@
void proc_init(void)
* \return Process structure of new created process
* if successful, NULL otherwise.
*/
* \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 stacksize, cpustack_t *stack_base)
+struct Process *proc_new_with_name(UNUSED(const char
*, name), void (*entry)(void), iptr_t data, size_t stacksize, cpustack_t *stack_base)
{
Process *proc;
size_t i;
{
Process *proc;
size_t i;
@@
-202,9
+208,9
@@
struct Process *proc_new_with_name(UNUSED(const char*, name), void (*entry)(void
#if (ARCH & ARCH_EMUL)
/* Ignore stack provided by caller and use the large enough default instead. */
#if (ARCH & ARCH_EMUL)
/* Ignore stack provided by caller and use the large enough default instead. */
- stack_base = (cpustack_t *)
StackFreeList.head
;
- REMOVE(
(Node *)stack_base
);
- stacksize =
DEF_
STACKSIZE;
+ stack_base = (cpustack_t *)
LIST_HEAD(&StackFreeList)
;
+ REMOVE(
LIST_HEAD(&StackFreeList)
);
+ stacksize =
CONFIG_KERN_DEF
STACKSIZE;
#elif CONFIG_KERN_HEAP
/* Did the caller provide a stack for us? */
if (!stack_base)
#elif CONFIG_KERN_HEAP
/* Did the caller provide a stack for us? */
if (!stack_base)
@@
-305,12
+311,14
@@
void proc_schedule(void)
/* Remember old process to save its context later */
old_process = CurrentProcess;
/* Remember old process to save its context later */
old_process = CurrentProcess;
+#ifdef IRQ_RUNNING
/* Scheduling in interrupts is a nono. */
ASSERT(!IRQ_RUNNING());
/* Scheduling in interrupts is a nono. */
ASSERT(!IRQ_RUNNING());
+#endif
/* Poll on the ready queue for the first ready process */
IRQ_SAVE_DISABLE(flags);
/* Poll on the ready queue for the first ready process */
IRQ_SAVE_DISABLE(flags);
- while (!(CurrentProcess = (struct Process *)
REMHEAD
(&ProcReadyList)))
+ while (!(CurrentProcess = (struct Process *)
list_remHead
(&ProcReadyList)))
{
/*
* Make sure we physically reenable interrupts here, no matter what
{
/*
* Make sure we physically reenable interrupts here, no matter what
@@
-360,8
+368,13
@@
void proc_schedule(void)
*/
void proc_exit(void)
{
*/
void proc_exit(void)
{
+#if CONFIG_KERN_MONITOR
+ monitor_remove(CurrentProcess);
+#endif
+
#if CONFIG_KERN_HEAP
#if CONFIG_KERN_HEAP
- /* The following code is BROKEN.
+ /*
+ * The following code is BROKEN.
* We are freeing our own stack before entering proc_schedule()
* BAJO: A correct fix would be to rearrange the scheduler with
* an additional parameter which frees the old stack/process
* We are freeing our own stack before entering proc_schedule()
* BAJO: A correct fix would be to rearrange the scheduler with
* an additional parameter which frees the old stack/process
@@
-373,21
+386,18
@@
void proc_exit(void)
#endif
#if (ARCH & ARCH_EMUL)
#endif
#if (ARCH & ARCH_EMUL)
-#
error
This is wrong
+#
warning
This is wrong
/* Reinsert process stack in free list */
ADDHEAD(&StackFreeList, (Node *)(CurrentProcess->stack
/* Reinsert process stack in free list */
ADDHEAD(&StackFreeList, (Node *)(CurrentProcess->stack
- - (
DEF_
STACKSIZE / sizeof(cpustack_t))));
+ - (
CONFIG_KERN_DEF
STACKSIZE / sizeof(cpustack_t))));
- /* NOTE: At this point the first two words of what used
+ /*
+ * NOTE: At this point the first two words of what used
* to be our stack contain a list node. From now on, we
* rely on the compiler not reading/writing the stack.
*/
#endif /* ARCH_EMUL */
* to be our stack contain a list node. From now on, we
* rely on the compiler not reading/writing the stack.
*/
#endif /* ARCH_EMUL */
-#if CONFIG_KERN_MONITOR
- monitor_remove(CurrentProcess);
-#endif
-
CurrentProcess = NULL;
proc_schedule();
/* not reached */
CurrentProcess = NULL;
proc_schedule();
/* not reached */