X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fpreempt.c;h=85aab8ea05a3e19eab9d976efbbbff753f1d42c7;hb=48fa213cd00cd385ee7274baf83761099a6ceead;hp=e24da145ba1c38ee09fc9363060c9bb0e46aec39;hpb=b0033f388edf3db04aec0901420a06bbc0f7ada7;p=bertos.git diff --git a/bertos/kern/preempt.c b/bertos/kern/preempt.c index e24da145..85aab8ea 100644 --- a/bertos/kern/preempt.c +++ b/bertos/kern/preempt.c @@ -87,7 +87,7 @@ 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) { @@ -101,7 +101,7 @@ void proc_preempt(UNUSED_ARG(void *, param) 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(); @@ -127,7 +127,7 @@ void proc_switch(void) IRQ_ASSERT_ENABLED(); ASSERT(preempt_forbid_cnt == 0); - // Will invoke proc_preempt() in interrupt context + // Will invoke proc_switch() in interrupt context kill(0, SIGUSR1); } @@ -153,9 +153,9 @@ void preempt_init(void) 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);