X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fproc.c;h=7fe9c70abc555029f5e7ce17044ab8b7713153fe;hb=22ea75fdc24002bc8b2a6fea2be1080cc3b39b1c;hp=046108c930ad25867f1a999c3682a58555c2ecb1;hpb=1981202f8c3e005f0504137204ddef70fcbc824c;p=bertos.git

diff --git a/kern/proc.c b/kern/proc.c
index 046108c9..7fe9c70a 100755
--- a/kern/proc.c
+++ b/kern/proc.c
@@ -3,7 +3,7 @@
  * <!--
  * Copyright 2001,2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999,2000,2001 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief Simple realtime multitasking scheduler.
@@ -17,6 +17,27 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.27  2005/11/04 16:20:02  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* Revision 1.26  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.25  2005/03/15 00:20:54  bernie
+ *#* proc_schedule(): New sanity check.
+ *#*
+ *#* Revision 1.24  2005/01/08 09:20:54  bernie
+ *#* Remove unused variable.
+ *#*
+ *#* Revision 1.23  2004/12/13 12:07:06  bernie
+ *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
+ *#*
+ *#* Revision 1.22  2004/12/13 11:51:08  bernie
+ *#* DISABLE_INTS/ENABLE_INTS: Convert to IRQ_DISABLE/IRQ_ENABLE.
+ *#*
+ *#* Revision 1.21  2004/11/28 23:20:25  bernie
+ *#* Remove obsolete INITLIST macro.
+ *#*
  *#* Revision 1.20  2004/11/16 22:37:14  bernie
  *#* Replace IPTR with iptr_t.
  *#*
@@ -79,12 +100,12 @@
 
 #include "proc_p.h"
 #include "proc.h"
-#include "cpu.h"
+#include <cfg/cpu.h>
 #include "event.h"
 #include "hw.h"
-#include <debug.h>
-#include <arch_config.h>  /* ARCH_EMUL */
-#include <macros.h>  /* ABS() */
+#include <cfg/debug.h>
+#include <cfg/arch_config.h>  /* ARCH_EMUL */
+#include <cfg/macros.h>  /* ABS() */
 
 #include <string.h> /* memset() */
 
@@ -146,7 +167,7 @@ static void proc_init_struct(Process *proc)
 
 void proc_init(void)
 {
-	INITLIST(&ProcReadyList);
+	LIST_INIT(&ProcReadyList);
 
 #if CONFIG_KERN_MONITOR
 	monitor_init();
@@ -173,7 +194,6 @@ void proc_init(void)
 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;
-	cpuflags_t flags;
 	size_t i;
 	size_t proc_size_words = ROUND2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t);
 #if CONFIG_KERN_HEAP
@@ -245,9 +265,7 @@ struct Process *proc_new_with_name(UNUSED(const char*, name), void (*entry)(void
 		CPU_PUSH_WORD(proc->stack, CPU_REG_INIT_VALUE(i));
 
 	/* Add to ready list */
-	DISABLE_IRQSAVE(flags);
-	SCHED_ENQUEUE(proc);
-	ENABLE_IRQRESTORE(flags);
+	ATOMIC(SCHED_ENQUEUE(proc));
 
 #if CONFIG_KERN_MONITOR
 	monitor_add(proc, name, stack_base, stacksize);
@@ -281,15 +299,18 @@ void proc_schedule(void)
 	 * the compiler might put them on the stack of the process
 	 * being switched out.
 	 */
-	static Process *old_process;
+	static struct Process *old_process;
 	static cpuflags_t flags;
 
 	/* Remember old process to save its context later */
 	old_process = CurrentProcess;
 
+	/* Scheduling in interrupts is a nono. */
+	ASSERT(!IRQ_RUNNING());
+
 	/* Poll on the ready queue for the first ready process */
-	DISABLE_IRQSAVE(flags);
-	while (!(CurrentProcess = (struct Process*)REMHEAD(&ProcReadyList)))
+	IRQ_SAVE_DISABLE(flags);
+	while (!(CurrentProcess = (struct Process *)REMHEAD(&ProcReadyList)))
 	{
 		/*
 		 * Make sure we physically reenable interrupts here, no matter what
@@ -297,22 +318,23 @@ void proc_schedule(void)
 		 * are idle-spinning, we must allow interrupts, otherwise no
 		 * process will ever wake up.
 		 *
-		 * \todo If there was a way to code sig_wait so that it does not
+		 * \todo If there was a way to write sig_wait() so that it does not
 		 * disable interrupts while waiting, there would not be any
 		 * reason to do this.
 		 */
-		ENABLE_INTS;
+		IRQ_ENABLE;
 		SCHEDULER_IDLE;
-		DISABLE_INTS;
+		IRQ_DISABLE;
 	}
-	ENABLE_IRQRESTORE(flags);
+	IRQ_RESTORE(flags);
 
-	/* Optimization: don't switch contexts when the active
+	/*
+	 * Optimization: don't switch contexts when the active
 	 * process has not changed.
 	 */
 	if (CurrentProcess != old_process)
 	{
-		static cpustack_t* dummy;
+		static cpustack_t *dummy;
 
 #if CONFIG_KERN_PREEMPTIVE
 		/* Reset quantum for this process */
@@ -380,9 +402,9 @@ void proc_switch(void)
 	/* Just like proc_schedule, this function must not have auto variables. */
 	static cpuflags_t flags;
 
-	DISABLE_IRQSAVE(flags);
+	IRQ_SAVE_DISABLE(flags);
 	SCHED_ENQUEUE(CurrentProcess);
-	ENABLE_IRQRESTORE(flags);
+	IRQ_RESTORE(flags);
 
 	proc_schedule();
 }