Merge branch 'vfs-dev'

[lunaix-os.git] / lunaix-os / kernel / time / timer.c

diff --git a/lunaix-os/kernel/time/timer.c b/lunaix-os/kernel/time/timer.c
index 42a9ac214262d655a3e4b628091fce92d397373b..7d9a391ee3624f1f2f3227d361ed745aed5b10b7 100644 (file)
--- a/lunaix-os/kernel/time/timer.c
+++ b/lunaix-os/kernel/time/timer.c
@@ -1,26 +1,27 @@
 /**
  * @file timer.c
  * @author Lunaixsky
 /**
  * @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
  * @version 0.1
  * @date 2022-03-12

- * 
+ *

  * @copyright Copyright (c) 2022
  * @copyright Copyright (c) 2022

- * 
+ *

  */
 #include <arch/x86/interrupts.h>
 #include <hal/apic.h>
 #include <hal/rtc.h>
 
  */
 #include <arch/x86/interrupts.h>
 #include <hal/apic.h>
 #include <hal/rtc.h>
 

-#include <lunaix/mm/kalloc.h>
+#include <lunaix/mm/cake.h>
+#include <lunaix/mm/valloc.h>
+#include <lunaix/sched.h>

 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 #include <lunaix/timer.h>
 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 #include <lunaix/timer.h>

-#include <lunaix/sched.h>

 
 #define LVT_ENTRY_TIMER(vector, mode) (LVT_DELIVERY_FIXED | mode | vector)
 
 
 #define LVT_ENTRY_TIMER(vector, mode) (LVT_DELIVERY_FIXED | mode | vector)
 

-

 LOG_MODULE("TIMER");
 
 static void
 LOG_MODULE("TIMER");
 
 static void


@@ -42,20 +43,21 @@ static volatile uint8_t apic_timer_done = 0;
 static volatile uint32_t sched_ticks = 0;
 static volatile uint32_t sched_ticks_counter = 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()
 {
 #define APIC_CALIBRATION_CONST 0x100000
 
 void
 timer_init_context()
 {

+    timer_pile = cake_new_pile("timer", sizeof(struct lx_timer), 1, 0);

     timer_ctx =
     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");
 
 
     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
 }
 
 void


@@ -79,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
         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
 
         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


@@ -98,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.");
     }
     if (frequency < 1000) {
         kprintf(KWARN "Frequency too low. Millisecond timer might be dodgy.");
     }

-    #endif
+#endif

 
     timer_ctx->base_frequency = 0;
     rtc_counter = 0;
 
     timer_ctx->base_frequency = 0;
     rtc_counter = 0;


@@ -119,7 +121,6 @@ timer_init(uint32_t frequency)
 
     wait_until(apic_timer_done);
 
 
     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);
     assert_msg(timer_ctx->base_frequency, "Fail to initialize timer (NOFREQ)");
 
     kprintf(KINFO "Base frequency: %u Hz\n", timer_ctx->base_frequency);


@@ -141,24 +142,35 @@ timer_init(uint32_t frequency)
     sched_ticks_counter = 0;
 }
 
     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)
 {
 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;
 
     timer->callback = callback;
     timer->counter = ticks;


@@ -166,9 +178,9 @@ timer_run(ticks_t ticks, void (*callback)(void*), void* payload, uint8_t flags)
     timer->payload = payload;
     timer->flags = 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
 }
 
 static void


@@ -179,20 +191,20 @@ timer_update(const isr_param* param)
 
     llist_for_each(pos, n, &timer_list_head->link, link)
     {
 
     llist_for_each(pos, n, &timer_list_head->link, link)
     {

-        if (--pos->counter) {
+        if (--(pos->counter)) {

             continue;
         }
 
         pos->callback ? pos->callback(pos->payload) : 1;
 
             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);
             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++;
 
     if (sched_ticks_counter >= sched_ticks) {


@@ -221,7 +233,8 @@ temp_intr_routine_apic_timer(const isr_param* param)
     rtc_disable_timer();
 }
 
     rtc_disable_timer();
 }
 

-struct lx_timer_context* 
-timer_context() {
+struct lx_timer_context*
+timer_context()
+{

     return timer_ctx;
 }
\ No newline at end of file
     return timer_ctx;
 }
\ No newline at end of file