X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fpreempt.c;h=f285d43f5a53c3e3932f3d1d5edca9be072a26d2;hb=a25f7626b143d85d6a146b95ae61baee1ed4d84b;hp=756a38fe0b89d1073b0c4585f8b702050877901a;hpb=40c25a4b1d0f1c23478c2d681b74662de968f671;p=bertos.git

diff --git a/bertos/kern/preempt.c b/bertos/kern/preempt.c
index 756a38fe..f285d43f 100644
--- a/bertos/kern/preempt.c
+++ b/bertos/kern/preempt.c
@@ -48,40 +48,50 @@
 
 int preempt_forbid_cnt;
 
-Timer preempt_timer;
+static Timer preempt_timer;
+
+
+// fwd decl from idle.c
+void idle_init(void);
 
 
 void proc_preempt(void)
 {
 	IRQ_DISABLE;
 
+	ASSERT(preempt_forbid_cnt == 0);
 	LIST_ASSERT_VALID(&ProcReadyList);
 	CurrentProcess = (struct Process *)list_remHead(&ProcReadyList);
-	LIST_ASSERT_VALID(&ProcReadyList);
 	ASSERT2(CurrentProcess, "no idle proc?");
 
 	IRQ_ENABLE;
 
-	TRACEMSG("new proc: %p:%s", CurrentProcess, CurrentProcess ? CurrentProcess->monitor.name : "---");
-	monitor_report();
+	TRACEMSG("launching %p:%s", CurrentProcess, proc_currentName());
 }
 
 void proc_preempt_timer(UNUSED_ARG(void *, param))
 {
-	/* Abort if task preemption is disabled */
-	if (preempt_forbid_cnt)
-		return;
-
-	IRQ_DISABLE;
-/*
-	if (!CurrentProcess->forbid_cnt)
+	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);
 		proc_preempt();
+#endif
+		#if CONFIG_KERN_PRI
+			}
+		#endif
+
+		IRQ_ENABLE;
 	}
-*/
-	IRQ_ENABLE;
 
 	timer_setDelay(&preempt_timer, CONFIG_KERN_QUANTUM);
 	timer_add(&preempt_timer);
@@ -118,30 +128,6 @@ void proc_entry(void (*user_entry)(void))
 	proc_exit();
 }
 
-
-static cpustack_t idle_stack[CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t)];
-
-// FIXME: move this to kern/idle.c
-/**
- * The idle process
- *
- * This process never dies and never sleeps.  It's also quite lazy, apathic
- * and a bit antisocial.
- *
- * Having an idle process costs some stack space, but simplifies the
- * interrupt-driven preemption logic because there is always a user
- * context to which we can return.
- */
-static NORETURN void idle(void)
-{
-	for (;;)
-	{
-		TRACE;
-		//monitor_report();
-		proc_yield(); // FIXME: CPU_IDLE
-	}
-}
-
 void preempt_init(void)
 {
 	MOD_CHECK(irq);
@@ -153,5 +139,5 @@ void preempt_init(void)
 	timer_setDelay(&preempt_timer, CONFIG_KERN_QUANTUM);
 	timer_add(&preempt_timer);
 
-	proc_new(idle, NULL, sizeof(idle_stack), idle_stack);
+	idle_init();
 }