Changeset 371bd7d in mainline for kernel/generic/src/interrupt/interrupt.c

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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) (4 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -44 +44 @@
 #include <console/console.h>
 #include <console/cmd.h>
+#include <ipc/event.h>
+#include <synch/mutex.h>
+#include <time/delay.h>
+#include <macros.h>
 #include <panic.h>
 #include <print.h>
@@ -109 +113 @@
 }
 
+/** Terminate thread and task if exception came from userspace. */
+void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
+{
+        task_t *task = TASK;
+        va_list args;
+
+        if (!istate_from_uspace(istate))
+                return;
+
+        printf("Task %s (%" PRIu64 ") killed due to an exception at "
+            "program counter %p.\n", task->name, task->taskid,
+            istate_get_pc(istate));
+
+        stack_trace_istate(istate);
+
+        printf("Kill message: ");
+        va_start(args, fmt);
+        vprintf(fmt, args);
+        va_end(args);
+        printf("\n");
+
+        /*
+         * Userspace can subscribe for FAULT events to take action
+         * whenever a thread faults. (E.g. take a dump, run a debugger).
+         * The notification is always available, but unless Udebug is enabled,
+         * that's all you get.
+         */
+        if (event_is_subscribed(EVENT_FAULT)) {
+                /* Notify the subscriber that a fault occurred. */
+                event_notify_3(EVENT_FAULT, LOWER32(TASK->taskid),
+                    UPPER32(TASK->taskid), (unative_t) THREAD);
+
+#ifdef CONFIG_UDEBUG
+                /* Wait for a debugging session. */
+                udebug_thread_fault();
+#endif
+        }
+
+        task_kill(task->taskid);
+        thread_exit();
+}
+
 #ifdef CONFIG_KCONSOLE
 
@@ -116 +162 @@
 #if (IVT_ITEMS > 0)
         unsigned int i;
-        char *symbol;
 
         spinlock_lock(&exctbl_lock);
@@ -131 +176 @@
         
         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__