* \author Bernie Innocenti <bernie@codewiz.org>
*/
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_proc.h"
#if CONFIG_KERN_PREEMPT
#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;
{
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?");
void proc_preempt(UNUSED_ARG(void *, param))
{
- if (!preempt_forbid_cnt)
+ if (proc_allowed())
{
IRQ_DISABLE;
/* Sleeping with IRQs disabled or preemption forbidden is illegal */
IRQ_ASSERT_ENABLED();
- ASSERT(preempt_forbid_cnt == 0);
+ ASSERT(proc_allowed());
// Will invoke proc_switch() in interrupt context
kill(0, SIGUSR1);