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

Timestamp:

2010-04-23T21:42:26Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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

@@ -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)
+                thread_update_accounting(true);
+
 #ifdef CONFIG_UDEBUG
         if (THREAD) THREAD->udebug.uspace_state = istate;
@@ -104 +109 @@
         if (THREAD && THREAD->interrupted && istate_from_uspace(istate))
                 thread_exit();
+
+        if (THREAD)
+                thread_update_accounting(false);
 }