Changes in kernel/generic/src/time/clock.c [d0c82c5:da1bafb] in mainline

File:

• kernel/generic/src/time/clock.c (modified) (4 diffs)

kernel/generic/src/time/clock.c

@@ -57 +57 @@
 #include <mm/frame.h>
 #include <ddi/ddi.h>
-#include <arch/cycle.h>
 
 /* Pointer to variable with uptime */
@@ -126 +125 @@
 }
 
-static void cpu_update_accounting(void)
-{
-        irq_spinlock_lock(&CPU->lock, false);
-        uint64_t now = get_cycle();
-        CPU->busy_cycles += now - CPU->last_cycle;
-        CPU->last_cycle = now;
-        irq_spinlock_unlock(&CPU->lock, false);
-}
-
 /** Clock routine
  *
@@ -146 +136 @@
         size_t missed_clock_ticks = CPU->missed_clock_ticks;
         
-        /* Account CPU usage */
-        cpu_update_accounting();
+        /* Account lost ticks to CPU usage */
+        if (CPU->idle)
+                CPU->idle_ticks += missed_clock_ticks + 1;
+        else
+                CPU->busy_ticks += missed_clock_ticks + 1;
+        
+        CPU->idle = false;
         
         /*
@@ -156 +151 @@
         size_t i;
         for (i = 0; i <= missed_clock_ticks; i++) {
-                /* Update counters and accounting */
                 clock_update_counters();
-                cpu_update_accounting();
-                
                 irq_spinlock_lock(&CPU->timeoutlock, false);