Changeset a074b4f in mainline for kernel/generic/src

Timestamp:

2010-01-23T19:19:18Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

03333bc

Parents:

336db295

Message:

Implement fault notifications and task monitoring service.

Location:

kernel/generic/src

Files:

• interrupt/interrupt.c (modified) (2 diffs)
• udebug/udebug.c (modified) (2 diffs)
• udebug/udebug_ops.c (modified) (1 diff)

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>
@@ -107 +111 @@
         fault_if_from_uspace(istate, "Unhandled exception %d.", n);
         panic("Unhandled exception %d.", n);
+}
+
+/** Terminate thread and task if exception came from userspace. */
+void fault_if_from_uspace(istate_t *istate, 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");
+
+        if (event_is_subscribed(EVENT_FAULT)) {
+                event_notify_3(EVENT_FAULT, LOWER32(TASK->taskid),
+                    UPPER32(TASK->taskid), (unative_t) THREAD);
+        }
+
+#ifdef CONFIG_UDEBUG
+        /* Wait until a debugger attends to us. */
+        mutex_lock(&THREAD->udebug.lock);
+        while (!THREAD->udebug.active)
+                condvar_wait(&THREAD->udebug.active_cv, &THREAD->udebug.lock);
+        mutex_unlock(&THREAD->udebug.lock);
+
+        udebug_stoppable_begin();
+        udebug_stoppable_end();
+
+        /* Make sure the debugging session is over before proceeding. */
+        mutex_lock(&THREAD->udebug.lock);
+        while (THREAD->udebug.active)
+                condvar_wait(&THREAD->udebug.active_cv, &THREAD->udebug.lock);
+        mutex_unlock(&THREAD->udebug.lock);
+#endif
+
+        task_kill(task->taskid);
+        thread_exit();
 }
 

kernel/generic/src/udebug/udebug.c

@@ -69 +69 @@
         mutex_initialize(&ut->lock, MUTEX_PASSIVE);
         waitq_initialize(&ut->go_wq);
+        condvar_initialize(&ut->active_cv);
 
         ut->go_call = NULL;
@@ -446 +447 @@
                                 waitq_wakeup(&t->udebug.go_wq, WAKEUP_FIRST);
                         }
+                        mutex_unlock(&t->udebug.lock);
+                        condvar_broadcast(&t->udebug.active_cv);
+                } else {
+                        mutex_unlock(&t->udebug.lock);
                 }
-                mutex_unlock(&t->udebug.lock);
         }
 

kernel/generic/src/udebug/udebug_ops.c

@@ -209 +209 @@
 
                 mutex_lock(&t->udebug.lock);
-                if ((t->flags & THREAD_FLAG_USPACE) != 0)
+                if ((t->flags & THREAD_FLAG_USPACE) != 0) {
                         t->udebug.active = true;
-                mutex_unlock(&t->udebug.lock);
+                        mutex_unlock(&t->udebug.lock);
+                        condvar_broadcast(&t->udebug.active_cv);
+                } else {
+                        mutex_unlock(&t->udebug.lock);
+                }
         }