Changeset cefb126 in mainline for kernel/generic/src/interrupt/interrupt.c

Timestamp:

2010-07-02T14:19:30Z (14 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/interrupt/interrupt.c (modified) (3 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -99 +99 @@
 void exc_dispatch(unsigned int n, istate_t *istate)
 {
+        ASSERT(CPU);
+        
 #if (IVT_ITEMS > 0)
         ASSERT(n < IVT_ITEMS);
@@ -110 +112 @@
         }
         
+        /* Account CPU usage if it has waked up from sleep */
+        irq_spinlock_lock(&CPU->lock, false);
+        if (CPU->idle) {
+                uint64_t now = get_cycle();
+                CPU->idle_cycles += now - CPU->last_cycle;
+                CPU->last_cycle = now;
+                CPU->idle = false;
+        }
+        irq_spinlock_unlock(&CPU->lock, false);
+        
         uint64_t begin_cycle = get_cycle();
         
@@ -131 +143 @@
         uint64_t end_cycle = get_cycle();
         
+        irq_spinlock_lock(&exctbl_lock, false);
         exc_table[n].cycles += end_cycle - begin_cycle;
         exc_table[n].count++;
+        irq_spinlock_unlock(&exctbl_lock, false);
         
         /* Do not charge THREAD for exception cycles */