Changeset 1735f3e in mainline for kernel/generic/src/udebug/udebug.c

Timestamp:

2010-01-31T18:22:37Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fc2e71e

Parents:

430de97 (diff), 2e07f62c (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 from mainline.

File:

• kernel/generic/src/udebug/udebug.c (modified) (3 diffs)

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);
         }
 
@@ -456 +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();
+}
 
 /** @}