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

Timestamp:

2010-05-21T07:50:04Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

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

kernel/generic/src/time/clock.c

@@ -86 +86 @@
         uptime->seconds1 = 0;
         uptime->seconds2 = 0;
-        uptime->useconds = 0; 
+        uptime->useconds = 0;
 
         clock_parea.pbase = (uintptr_t) faddr;
@@ -137 +137 @@
         size_t missed_clock_ticks = CPU->missed_clock_ticks;
         unsigned int i;
+
+        /* 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;
 
         /*
@@ -187 +195 @@
                 spinlock_unlock(&THREAD->lock);
                 
-                if (!ticks && !PREEMPTION_DISABLED) {
+                if ((!ticks) && (!PREEMPTION_DISABLED)) {
 #ifdef CONFIG_UDEBUG
                         istate_t *istate;