Changeset 94f8e3c1 in mainline for kernel/generic/src/ipc/kbox.c

Timestamp:

2008-10-20T20:45:19Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

5045a68

Parents:

338a8382

Message:

Fix panic when debugged task quits. Also fix memory leak when debugger disconnects first.

File:

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

kernel/generic/src/ipc/kbox.c

@@ -46 +46 @@
 void ipc_kbox_cleanup(void)
 {
+        ipl_t ipl;
         bool have_kb_thread;
 
@@ -64 +65 @@
          */
         ipc_answerbox_slam_phones(&TASK->kernel_box, have_kb_thread);
+
+        /* 
+         * If the task was being debugged, clean up debugging session.
+         * This is necessarry as slamming the phones won't force
+         * kbox thread to clean it up since sender != debugger.
+         */
+        ipl = interrupts_disable();
+        spinlock_lock(&TASK->lock);
+        udebug_task_cleanup(TASK);
+        spinlock_unlock(&TASK->lock);
+        interrupts_restore(ipl);
         
         if (have_kb_thread) {
@@ -127 +139 @@
                                 spinlock_lock(&TASK->answerbox.lock);
                                 if (list_empty(&TASK->answerbox.connected_phones)) {
-                                        /* Last phone has been disconnected */
+                                        /*
+                                         * Last phone has been disconnected.
+                                         */
+
+                                        /* Detach thread so it gets freed. */
+                                        thread_detach(TASK->kb_thread);
                                         TASK->kb_thread = NULL;
                                         done = true;