* 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>
#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_allowed());
LIST_ASSERT_VALID(&ProcReadyList);
CurrentProcess = (struct Process *)list_remHead(&ProcReadyList);
ASSERT2(CurrentProcess, "no idle proc?");
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_allowed())
{
IRQ_DISABLE;
TRACEMSG("preempting %p:%s", CurrentProcess, proc_currentName());
-// FIXME: this still break havocs, probably because of some reentrancy issue
+// FIXME: this still breaks havoc, probably because of some reentrancy issue
#if 0
SCHED_ENQUEUE(CurrentProcess);
proc_schedule();
/* Sleeping with IRQs disabled or preemption forbidden is illegal */
IRQ_ASSERT_ENABLED();
- ASSERT(preempt_forbid_cnt == 0);
+ ASSERT(proc_allowed());
- // Will invoke proc_preempt() in interrupt context
+ // Will invoke proc_switch() in interrupt context
kill(0, SIGUSR1);
}
MOD_CHECK(irq);
MOD_CHECK(timer);
- irq_register(SIGUSR1, proc_preempt);
+ 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);