X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=bertos%2Fkern%2Fpreempt.c;h=f285d43f5a53c3e3932f3d1d5edca9be072a26d2;hb=ecc3d927e252b3fa278b5320f16364fc14d61220;hp=9af6c0d1b402a973cc144532c15c2f1ae5d15d2f;hpb=3b33eb4b36445ee045f4cbac27f9331988205467;p=bertos.git

diff --git a/bertos/kern/preempt.c b/bertos/kern/preempt.c
index 9af6c0d1..f285d43f 100644
--- a/bertos/kern/preempt.c
+++ b/bertos/kern/preempt.c
@@ -29,8 +29,7 @@
  * Copyright 2008 Bernie Innocenti <bernie@codewiz.org>
  * -->
  *
- * \brief Simple realtime multitasking scheduler.
- *        Context switching is only done cooperatively.
+ * \brief Simple preemptive multitasking scheduler.
  *
  * \version $Id: proc.c 1616 2008-08-10 19:41:26Z bernie $
  * \author Bernie Innocenti <bernie@codewiz.org>
@@ -40,96 +39,59 @@
 #include "proc.h"
 
 #include <kern/irq.h>
+#include <kern/monitor.h>
 #include <cpu/frame.h> // CPU_IDLE
+#include <cpu/irq.h>   // IRQ_DISABLE()...
 #include <drv/timer.h>
 #include <cfg/module.h>
 
 
-/*
- * The time sharing scheduler forces a task switch when the current
- * process has exhausted its quantum.
- */
-uint16_t Quantum;
+int preempt_forbid_cnt;
 
-Timer preempt_timer;
+static Timer preempt_timer;
 
-/**
- * Disable preemptive task switching.
- *
- * The scheduler maintains a per-process nesting counter.  Task switching is
- * effectively re-enabled only when the number of calls to proc_permit()
- * matches the number of calls to proc_forbid().
- *
- * Calling functions that could sleep while task switching is disabled
- * is dangerous, although supported.  Preemptive task switching is
- * resumed while the process is sleeping and disabled again as soon as
- * it wakes up again.
- *
- * \sa proc_permit()
- */
-void proc_forbid(void)
-{
-	/* No need to protect against interrupts here. */
-	++CurrentProcess->forbid_cnt;
-}
 
-/**
- * Re-enable preemptive task switching.
- *
- * \sa proc_forbid()
- */
-void proc_permit(void)
-{
-	/* No need to protect against interrupts here. */
-	--CurrentProcess->forbid_cnt;
-}
+// fwd decl from idle.c
+void idle_init(void);
 
 
 void proc_preempt(void)
 {
-	TRACE;
+	IRQ_DISABLE;
 
-	ATOMIC(LIST_ASSERT_VALID(&ProcReadyList));
+	ASSERT(preempt_forbid_cnt == 0);
+	LIST_ASSERT_VALID(&ProcReadyList);
+	CurrentProcess = (struct Process *)list_remHead(&ProcReadyList);
+	ASSERT2(CurrentProcess, "no idle proc?");
 
-	TRACEMSG("hello1");
-	IRQ_DISABLE;
-	/* Poll on the ready queue for the first ready process */
-	while (!(CurrentProcess = (struct Process *)list_remHead(&ProcReadyList)))
-	{
-	//TRACEMSG("hello2");
-		/*
-		 * Make sure we physically reenable interrupts here, no matter what
-		 * the current task status is. This is important because if we
-		 * are idle-spinning, we must allow interrupts, otherwise no
-		 * process will ever wake up.
-		 *
-		 * During idle-spinning, an interrupt can occur and it may
-		 * modify \p ProcReadyList. To ensure that compiler reload this
-		 * variable every while cycle we call CPU_MEMORY_BARRIER.
-		 * The memory barrier ensure that all variables used in this context
-		 * are reloaded.
-		 */
-		IRQ_ENABLE;
-		//FIXME: calls Qt stuff from sighandler! CPU_IDLE;
-		MEMORY_BARRIER;
-		IRQ_DISABLE;
-	//TRACEMSG("hello3");
-	}
 	IRQ_ENABLE;
-	TRACEMSG("hello4");
+
+	TRACEMSG("launching %p:%s", CurrentProcess, proc_currentName());
 }
 
 void proc_preempt_timer(UNUSED_ARG(void *, param))
 {
-	IRQ_DISABLE;
-	if (CurrentProcess)
+	if (!preempt_forbid_cnt)
 	{
-		TRACEMSG("preempting %p:%s", CurrentProcess, CurrentProcess->monitor.name);
+		IRQ_DISABLE;
+
+		#if CONFIG_KERN_PRI
+			Process *rival = (Process *)LIST_HEAD(&ProcReadyList);
+			if (rival && rival->link.pri >= CurrentProcess->link.pri)
+			{
+		#endif
+
+		TRACEMSG("preempting %p:%s", CurrentProcess, proc_currentName());
+#if 0
 		SCHED_ENQUEUE(CurrentProcess);
-		IRQ_ENABLE;
 		proc_preempt();
+#endif
+		#if CONFIG_KERN_PRI
+			}
+		#endif
+
+		IRQ_ENABLE;
 	}
-	IRQ_ENABLE;
 
 	timer_setDelay(&preempt_timer, CONFIG_KERN_QUANTUM);
 	timer_add(&preempt_timer);
@@ -137,7 +99,13 @@ void proc_preempt_timer(UNUSED_ARG(void *, param))
 
 void proc_schedule(void)
 {
-	TRACE;
+	ATOMIC(LIST_ASSERT_VALID(&ProcReadyList));
+	TRACEMSG("%p:%s", CurrentProcess, proc_currentName());
+	ATOMIC(LIST_ASSERT_VALID(&ProcReadyList));
+
+	/* Sleeping with IRQs disabled or preemption forbidden is illegal */
+	ASSERT_IRQ_ENABLED();
+	ASSERT(preempt_forbid_cnt == 0);
 
 	// Will invoke proc_preempt() in interrupt context
 	kill(0, SIGUSR1);
@@ -145,7 +113,11 @@ void proc_schedule(void)
 
 void proc_yield(void)
 {
-	ATOMIC(SCHED_ENQUEUE(CurrentProcess));
+	TRACEMSG("%p:%s", CurrentProcess, proc_currentName());
+
+	IRQ_DISABLE;
+	SCHED_ENQUEUE(CurrentProcess);
+	IRQ_ENABLE;
 
 	proc_schedule();
 }
@@ -166,4 +138,6 @@ void preempt_init(void)
 	timer_setSoftint(&preempt_timer, proc_preempt_timer, NULL);
 	timer_setDelay(&preempt_timer, CONFIG_KERN_QUANTUM);
 	timer_add(&preempt_timer);
+
+	idle_init();
 }