mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 15:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

timer: limit

Browse Source
This commit is contained in:
Matheus
2024-09-21 19:26:21 -03:00
parent 100c045e36
commit 6d436b1a9a
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/arch/x86-64/apic.c
+1 -1
View File
@@ -237,7 +237,7 @@ void arch_apic_timerinit() {
writelapic(APIC_LVT_TIMER, vec); writelapic(APIC_LVT_TIMER, vec);
current_cpu()->timer = timer_new(ticksperus, armtimer, stoptimer); current_cpu()->timer = timer_new(ticksperus, armtimer, stoptimer, 0xffffffff);
__assert(current_cpu()->timer); __assert(current_cpu()->timer);
} }
kernel-src/include/kernel/timer.h
+3 -1
View File
@@ -19,8 +19,10 @@ typedef struct timerentry_t {
typedef struct { typedef struct {
spinlock_t lock; spinlock_t lock;
time_t tick_limit;
time_t ticksperus; time_t ticksperus;
time_t tickcurrent; time_t tickcurrent;
time_t current_target;
bool running; bool running;
void (*arm)(time_t); void (*arm)(time_t);
time_t (*stop)(); time_t (*stop)();
@@ -32,6 +34,6 @@ void timer_stop(timer_t *timer);
void timer_isr(timer_t *timer, context_t *context); void timer_isr(timer_t *timer, context_t *context);
void timer_insert(timer_t *timer, timerentry_t *entry, dpcfn_t fn, dpcarg_t arg, time_t us, bool repeating); void timer_insert(timer_t *timer, timerentry_t *entry, dpcfn_t fn, dpcarg_t arg, time_t us, bool repeating);
uintmax_t timer_remove(timer_t *timer, timerentry_t *entry); uintmax_t timer_remove(timer_t *timer, timerentry_t *entry);
timer_t *timer_new(time_t ticksperus, void (*arm)(time_t), time_t (*stop)()); timer_t *timer_new(time_t ticksperus, void (*arm)(time_t), time_t (*stop)(), time_t tick_limit);
#endif #endif
kernel-src/sys/timer.c
+20 -11
View File
@@ -36,6 +36,18 @@ static void insert(timer_t *timer, timerentry_t *entry, time_t us) {
} }
} }
// expects IPL to be at least IPL_TIMER
static inline void arm_for_next_target(timer_t *timer) {
time_t target;
if (timer->queue)
target = min(timer->queue->absolutetick - timer->tickcurrent, timer->tick_limit);
else
target = timer->tick_limit;
timer->current_target = timer->tickcurrent + target;
timer->arm(target);
}
// expects IPL to be at least IPL_TIMER // expects IPL to be at least IPL_TIMER
static void timercheck(timer_t *timer) { static void timercheck(timer_t *timer) {
while (timer->queue && timer->queue->absolutetick == timer->tickcurrent) { while (timer->queue && timer->queue->absolutetick == timer->tickcurrent) {
@@ -52,14 +64,12 @@ static void timercheck(timer_t *timer) {
} }
} }
// TODO if an entry is removed and the timer still fires,
// it will skip forwards in time which is bad BAD
void timer_isr(timer_t *timer, context_t *context) { void timer_isr(timer_t *timer, context_t *context) {
spinlock_acquire(&timer->lock); spinlock_acquire(&timer->lock);
__assert(timer->queue); __assert(timer->queue);
timer->tickcurrent = timer->queue->absolutetick; timer->tickcurrent = timer->current_target;
timerentry_t *oldentry = timer->queue; timerentry_t *oldentry = timer->queue;
timer->queue = timer->queue->next; timer->queue = timer->queue->next;
oldentry->next = NULL; oldentry->next = NULL;
@@ -71,10 +81,8 @@ void timer_isr(timer_t *timer, context_t *context) {
dpc_enqueue(&oldentry->dpc, oldentry->fn, oldentry->arg); dpc_enqueue(&oldentry->dpc, oldentry->fn, oldentry->arg);
if (timer->queue) { timercheck(timer);
timercheck(timer); arm_for_next_target(timer);
timer->arm(timer->queue->absolutetick - timer->tickcurrent);
}
spinlock_release(&timer->lock); spinlock_release(&timer->lock);
} }
@@ -89,7 +97,7 @@ void timer_resume(timer_t *timer) {
goto leave; goto leave;
timercheck(timer); timercheck(timer);
timer->arm(timer->queue->absolutetick - timer->tickcurrent); arm_for_next_target(timer);
leave: leave:
spinlock_release(&timer->lock); spinlock_release(&timer->lock);
@@ -123,7 +131,7 @@ void timer_insert(timer_t *timer, timerentry_t *entry, dpcfn_t fn, dpcarg_t arg,
if (timer->running) { if (timer->running) {
timercheck(timer); timercheck(timer);
timer->arm(timer->queue->absolutetick - timer->tickcurrent); arm_for_next_target(timer);
} }
spinlock_release(&timer->lock); spinlock_release(&timer->lock);
@@ -165,7 +173,7 @@ uintmax_t timer_remove(timer_t *timer, timerentry_t *entry) {
if (timer->queue) { if (timer->queue) {
timercheck(timer); timercheck(timer);
timer->arm(timer->queue->absolutetick - timer->tickcurrent); arm_for_next_target(timer);
} }
cleanup: cleanup:
@@ -174,13 +182,14 @@ uintmax_t timer_remove(timer_t *timer, timerentry_t *entry) {
return timeremaining; return timeremaining;
} }
timer_t *timer_new(time_t ticksperus, void (*arm)(time_t), time_t (*stop)()) { timer_t *timer_new(time_t ticksperus, void (*arm)(time_t), time_t (*stop)(), time_t tick_limit) {
timer_t *timer = alloc(sizeof(timer_t)); timer_t *timer = alloc(sizeof(timer_t));
if (timer == NULL) if (timer == NULL)
return NULL; return NULL;
timer->ticksperus = ticksperus; timer->ticksperus = ticksperus;
timer->running = false; timer->running = false;
timer->tick_limit = tick_limit;
timer->arm = arm; timer->arm = arm;
timer->stop = stop; timer->stop = stop;
SPINLOCK_INIT(timer->lock); SPINLOCK_INIT(timer->lock);