X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/9440be3a5115a91dcdf8dff05a361cac4b6cea29..af8e873ae38b72a56a89485c62bb5ccd22a9f8a7:/lunaix-os/kernel/time/timer.c diff --git a/lunaix-os/kernel/time/timer.c b/lunaix-os/kernel/time/timer.c index 03ef2b4..7d9a391 100644 --- a/lunaix-os/kernel/time/timer.c +++ b/lunaix-os/kernel/time/timer.c @@ -1,25 +1,27 @@ /** * @file timer.c * @author Lunaixsky - * @brief A simple timer implementation based on APIC with adjustable frequency and subscribable "timerlets" + * @brief A simple timer implementation based on APIC with adjustable frequency + * and subscribable "timerlets" * @version 0.1 * @date 2022-03-12 - * + * * @copyright Copyright (c) 2022 - * + * */ #include #include #include -#include +#include +#include +#include #include #include #include #define LVT_ENTRY_TIMER(vector, mode) (LVT_DELIVERY_FIXED | mode | vector) - LOG_MODULE("TIMER"); static void @@ -38,19 +40,24 @@ static volatile struct lx_timer_context* timer_ctx = NULL; static volatile uint32_t rtc_counter = 0; static volatile uint8_t apic_timer_done = 0; +static volatile uint32_t sched_ticks = 0; +static volatile uint32_t sched_ticks_counter = 0; + +static struct cake_pile* timer_pile; + #define APIC_CALIBRATION_CONST 0x100000 void timer_init_context() { + timer_pile = cake_new_pile("timer", sizeof(struct lx_timer), 1, 0); timer_ctx = - (struct lx_timer_context*)lxmalloc(sizeof(struct lx_timer_context)); + (struct lx_timer_context*)valloc(sizeof(struct lx_timer_context)); assert_msg(timer_ctx, "Fail to initialize timer contex"); - timer_ctx->active_timers = - (struct lx_timer*)lxmalloc(sizeof(struct lx_timer)); - llist_init_head(timer_ctx->active_timers); + timer_ctx->active_timers = (struct lx_timer*)cake_grab(timer_pile); + llist_init_head(&timer_ctx->active_timers->link); } void @@ -74,13 +81,13 @@ timer_init(uint32_t frequency) Timer calibration process - measure the APIC timer base frequency step 1: setup a temporary isr for RTC timer which trigger at each tick - (1024Hz) - step 2: setup a temporary isr for #APIC_TIMER_IV - step 3: setup the divider, APIC_TIMER_DCR - step 4: Startup RTC timer - step 5: Write a large value, v, to APIC_TIMER_ICR to start APIC timer (this must be - followed immediately after step 4) - step 6: issue a write to EOI and clean up. + (1024Hz) + step 2: setup a temporary isr for #APIC_TIMER_IV + step 3: setup the divider, APIC_TIMER_DCR + step 4: Startup RTC timer + step 5: Write a large value, v, to APIC_TIMER_ICR to start APIC timer + (this must be followed immediately after step 4) step 6: issue a write to + EOI and clean up. When the APIC ICR counting down to 0 #APIC_TIMER_IV triggered, save the rtc timer's counter, k, and disable RTC timer immediately (although the @@ -93,11 +100,11 @@ timer_init(uint32_t frequency) */ - #ifdef __LUNAIXOS_DEBUG__ +#ifdef __LUNAIXOS_DEBUG__ if (frequency < 1000) { kprintf(KWARN "Frequency too low. Millisecond timer might be dodgy."); } - #endif +#endif timer_ctx->base_frequency = 0; rtc_counter = 0; @@ -114,7 +121,6 @@ timer_init(uint32_t frequency) wait_until(apic_timer_done); - assert_msg(timer_ctx->base_frequency, "Fail to initialize timer (NOFREQ)"); kprintf(KINFO "Base frequency: %u Hz\n", timer_ctx->base_frequency); @@ -131,26 +137,40 @@ timer_init(uint32_t frequency) intr_subscribe(APIC_TIMER_IV, timer_update); apic_write_reg(APIC_TIMER_ICR, timer_ctx->tphz); + + sched_ticks = timer_ctx->running_frequency / 1000 * SCHED_TIME_SLICE; + sched_ticks_counter = 0; } -int -timer_run_second(uint32_t second, void (*callback)(void*), void* payload, uint8_t flags) +struct lx_timer* +timer_run_second(uint32_t second, + void (*callback)(void*), + void* payload, + uint8_t flags) { - return timer_run(second * timer_ctx->running_frequency, callback, payload, flags); + return timer_run( + second * timer_ctx->running_frequency, callback, payload, flags); } -int -timer_run_ms(uint32_t millisecond, void (*callback)(void*), void* payload, uint8_t flags) +struct lx_timer* +timer_run_ms(uint32_t millisecond, + void (*callback)(void*), + void* payload, + uint8_t flags) { - return timer_run(timer_ctx->running_frequency / 1000 * millisecond, callback, payload, flags); + return timer_run(timer_ctx->running_frequency / 1000 * millisecond, + callback, + payload, + flags); } -int +struct lx_timer* timer_run(ticks_t ticks, void (*callback)(void*), void* payload, uint8_t flags) { - struct lx_timer* timer = (struct lx_timer*)lxmalloc(sizeof(struct lx_timer)); + struct lx_timer* timer = (struct lx_timer*)cake_grab(timer_pile); - if (!timer) return 0; + if (!timer) + return NULL; timer->callback = callback; timer->counter = ticks; @@ -158,9 +178,9 @@ timer_run(ticks_t ticks, void (*callback)(void*), void* payload, uint8_t flags) timer->payload = payload; timer->flags = flags; - llist_append(timer_ctx->active_timers, &timer->link); + llist_append(&timer_ctx->active_timers->link, &timer->link); - return 1; + return timer; } static void @@ -171,19 +191,26 @@ timer_update(const isr_param* param) llist_for_each(pos, n, &timer_list_head->link, link) { - if (--pos->counter) { + if (--(pos->counter)) { continue; } pos->callback ? pos->callback(pos->payload) : 1; - if (pos->flags & TIMER_MODE_PERIODIC) { + if ((pos->flags & TIMER_MODE_PERIODIC)) { pos->counter = pos->deadline; } else { llist_delete(&pos->link); - lxfree(pos); + cake_release(timer_pile, pos); } } + + sched_ticks_counter++; + + if (sched_ticks_counter >= sched_ticks) { + sched_ticks_counter = 0; + schedule(); + } } static void @@ -206,7 +233,8 @@ temp_intr_routine_apic_timer(const isr_param* param) rtc_disable_timer(); } -struct lx_timer_context* -timer_context() { +struct lx_timer_context* +timer_context() +{ return timer_ctx; } \ No newline at end of file