X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fpreempt.c;h=48a1278ebffa7b0d6df4937a417d2c08eb82b3bf;hb=cf5af2b25de263a964bf29a7465cdfe536d32e59;hp=a9201f61cb7a8413e093d77038e128620d536a1e;hpb=09abedc98781b1c1201fd9f3b9c97ff83fcdf65b;p=bertos.git

diff --git a/bertos/kern/preempt.c b/bertos/kern/preempt.c
index a9201f61..48a1278e 100644
--- a/bertos/kern/preempt.c
+++ b/bertos/kern/preempt.c
@@ -40,16 +40,17 @@
  * In the POSIX implementaiton, context switching is done by the portable
  * SVR4 swapcontext() facility.
  *
- * \version $Id: proc.c 1616 2008-08-10 19:41:26Z bernie $
+ * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_proc.h"
 
 #if CONFIG_KERN_PREEMPT
 
 #include "proc_p.h"
 #include "proc.h"
+#include "idle.h"
 
 #include <kern/irq.h>
 #include <kern/monitor.h>
@@ -60,24 +61,21 @@
 #include <cfg/depend.h>    // CONFIG_DEPEND()
 
 // Check config dependencies
-CONFIG_DEPEND(CONFIG_KERN_PREEMPT,    CONFIG_KERN_SCHED && CONFIG_TIMER_EVENTS && CONFIG_KERN_IRQ);
+CONFIG_DEPEND(CONFIG_KERN_PREEMPT, CONFIG_KERN && CONFIG_TIMER_EVENTS && CONFIG_KERN_IRQ);
 
 MOD_DEFINE(preempt)
 
-int preempt_forbid_cnt;
+/// Global preemption disabling nesting counter
+cpu_atomic_t _preempt_forbid_cnt;
 
 static Timer preempt_timer;
 
 
-// fwd decl from idle.c
-void idle_init(void);
-
-
 void proc_schedule(void)
 {
 	IRQ_DISABLE;
 
-	ASSERT(preempt_forbid_cnt == 0);
+	ASSERT(proc_preemptAllowed());
 	LIST_ASSERT_VALID(&ProcReadyList);
 	CurrentProcess = (struct Process *)list_remHead(&ProcReadyList);
 	ASSERT2(CurrentProcess, "no idle proc?");
@@ -87,9 +85,9 @@ void proc_schedule(void)
 	TRACEMSG("launching %p:%s", CurrentProcess, proc_currentName());
 }
 
-void proc_preempt(UNUSED_ARG(void *, param)
+void proc_preempt(UNUSED_ARG(void *, param))
 {
-	if (!preempt_forbid_cnt)
+	if (proc_preemptAllowed())
 	{
 		IRQ_DISABLE;
 
@@ -125,7 +123,7 @@ void proc_switch(void)
 
 	/* Sleeping with IRQs disabled or preemption forbidden is illegal */
 	IRQ_ASSERT_ENABLED();
-	ASSERT(preempt_forbid_cnt == 0);
+	ASSERT(proc_preemptAllowed());
 
 	// Will invoke proc_switch() in interrupt context
 	kill(0, SIGUSR1);
@@ -155,7 +153,7 @@ void preempt_init(void)
 
 	irq_register(SIGUSR1, proc_schedule);
 
-	timer_setSoftint(&preempt_timer, proc_preempt_timer, NULL);
+	timer_setSoftint(&preempt_timer, proc_preempt, NULL);
 	timer_setDelay(&preempt_timer, CONFIG_KERN_QUANTUM);
 	timer_add(&preempt_timer);