Changeset cefb126 in mainline for kernel/generic/src/time/clock.c

Timestamp:

2010-07-02T14:19:30Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

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 */
@@ -125 +126 @@
 }
 
+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
  *
@@ -136 +146 @@
         size_t missed_clock_ticks = CPU->missed_clock_ticks;
         
-        /* 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;
+        /* Account CPU usage */
+        cpu_update_accounting();
         
         /*
@@ -151 +156 @@
         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);