Changes in kernel/generic/src/interrupt/interrupt.c [8f4f444:181a746] in mainline

File:

• kernel/generic/src/interrupt/interrupt.c (modified) (4 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -50 +50 @@
 #include <panic.h>
 #include <print.h>
-#include <stdarg.h>
 #include <symtab.h>
 #include <proc/thread.h>
@@ -111 +110 @@
         }
         
-        /* Account CPU usage if it has waked up from sleep */
-        if (CPU) {
+        /* Account CPU usage if it woke up from sleep */
+        if (CPU && CPU->idle) {
                 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;
-                }
+                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);
         }
@@ -166 +163 @@
 }
 
-static NO_TRACE void fault_from_uspace_core(istate_t *istate, const char *fmt, va_list args)
-{
+/** Terminate thread and task if exception came from userspace.
+ *
+ */
+NO_TRACE void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
+{
+        if (!istate_from_uspace(istate))
+                return;
+        
         printf("Task %s (%" PRIu64 ") killed due to an exception at "
             "program counter %p.\n", TASK->name, TASK->taskid,
@@ -176 +179 @@
         
         printf("Kill message: ");
-        vprintf(fmt, args);
-        printf("\n");
-        
-        task_kill_self(true);
-}
-
-/** Terminate thread and task after the exception came from userspace.
- *
- */
-NO_TRACE void fault_from_uspace(istate_t *istate, const char *fmt, ...)
-{
-        va_list args;
-
-        va_start(args, fmt);
-        fault_from_uspace_core(istate, fmt, args);
-        va_end(args);
-}
-
-/** Terminate thread and task if exception came from userspace.
- *
- */
-NO_TRACE void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
-{
-        if (!istate_from_uspace(istate))
-                return;
         
         va_list args;
         va_start(args, fmt);
-        fault_from_uspace_core(istate, fmt, args);
+        vprintf(fmt, args);
         va_end(args);
+        printf("\n");
+        
+        task_kill_self(true);
 }