Changeset 0d21b53 in mainline

Timestamp:

2010-01-25T20:15:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

80487bc5

Parents:

bc310a05

Message:

Move code code waiting for debugger to udebug.c:udebug_thread_fault(). Do not call it if nobody is subscribed for FAULT events. Make thread stoppable during all waiting in udebug_thread_fault().

Location:

kernel/generic

Files:

• include/udebug/udebug.h (modified) (1 diff)
• src/interrupt/interrupt.c (modified) (1 diff)
• src/udebug/udebug.c (modified) (1 diff)

kernel/generic/include/udebug/udebug.h

@@ -218 +218 @@
 
 int udebug_task_cleanup(struct task *ta);
+void udebug_thread_fault(void);
 
 #endif

kernel/generic/src/interrupt/interrupt.c

@@ -134 +134 @@
         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
         }
-
-#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);

kernel/generic/src/udebug/udebug.c

@@ -460 +460 @@
 }
 
+/** Wait for debugger to handle a fault in this thread.
+ *
+ * When a thread faults and someone is subscribed to the FAULT kernel event,
+ * this function is called to wait for a debugging session to give userspace
+ * a chance to examine the faulting thead/task. When the debugging session
+ * is over, this function returns (so that thread/task cleanup can continue).
+ */
+void udebug_thread_fault(void)
+{
+        udebug_stoppable_begin();
+
+        /* 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);
+
+        /* 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);
+
+        udebug_stoppable_end();
+}
 
 /** @}