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

Timestamp:

2010-05-21T07:50:04Z (15 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/interrupt/interrupt.c (modified) (6 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -51 +51 @@
 #include <print.h>
 #include <symtab.h>
+#include <proc/thread.h>
 
 static struct {
@@ -91 +92 @@
         ASSERT(n < IVT_ITEMS);
 
+        /* Account user cycles */
+        if (THREAD) {
+                spinlock_lock(&THREAD->lock);
+                thread_update_accounting(true);
+                spinlock_unlock(&THREAD->lock);
+        }
+
 #ifdef CONFIG_UDEBUG
         if (THREAD) THREAD->udebug.uspace_state = istate;
@@ -104 +112 @@
         if (THREAD && THREAD->interrupted && istate_from_uspace(istate))
                 thread_exit();
+
+        if (THREAD) {
+                spinlock_lock(&THREAD->lock);
+                thread_update_accounting(false);
+                spinlock_unlock(&THREAD->lock);
+        }
 }
 
@@ -114 +128 @@
 
 /** Terminate thread and task if exception came from userspace. */
-void fault_if_from_uspace(istate_t *istate, char *fmt, ...)
+void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
 {
         task_t *task = TASK;
@@ -162 +176 @@
 #if (IVT_ITEMS > 0)
         unsigned int i;
-        char *symbol;
 
         spinlock_lock(&exctbl_lock);
@@ -177 +190 @@
         
         for (i = 0; i < IVT_ITEMS; i++) {
-                symbol = symtab_fmt_name_lookup((unative_t) exc_table[i].f);
+                const char *symbol = symtab_fmt_name_lookup((unative_t) exc_table[i].f);
 
 #ifdef __32_BITS__