Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-09 00:00:03 +01:00
Code Issues Releases Wiki Activity

kernel/tasks: set correct timer when waking up tasks with DYNAMIC_TICKS

Browse source
This commit is contained in:
daniel-k 2016-09-01 15:53:43 +02:00
parent 5756951267
commit ab88f57701
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hermit/include/hermit/time.h
View file

@ -83,6 +83,8 @@ static inline void sleep(unsigned int sec) { timer_wait(sec*TIMER_FREQ); }
static inline int timer_deadline(uint32_t t) { return apic_timer_deadline(t); }
static inline void timer_disable() { apic_disable_timer(); }
#ifdef __cplusplus
}
#endif

18
hermit/kernel/tasks.c
View file

@ -587,8 +587,24 @@ int wakeup_task(tid_t id)
task->prev->next = task->next;
if (task->next)
task->next->prev = task->prev;
if (readyqueues[core_id].timers.first == task)
if (readyqueues[core_id].timers.first == task) {
readyqueues[core_id].timers.first = task->next;
#ifdef DYNAMIC_TICKS
const task_t* first = readyqueues[core_id].timers.first;
if(first) {
if(first->timeout > get_clock_tick()) {
timer_deadline(first->timeout - get_clock_tick());
} else {
// workaround: start timer so new head will be serviced
timer_deadline(1);
}
} else {
// prevent spurious interrupts
timer_disable();
}
#endif
}
if (readyqueues[core_id].timers.last == task)
readyqueues[core_id].timers.last = task->prev;
}