Changeset 875c629 in mainline for kernel/generic/src/proc/task.c

Timestamp:

2011-01-27T17:19:49Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

577f042a, f579760

Parents:

bf75e3cb (diff), 5b7a107 (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 'btrace' kernel console command (a last resort debugging means for printing uspace stack traces from within kernel console)

File:

• kernel/generic/src/proc/task.c (modified) (2 diffs)

kernel/generic/src/proc/task.c

@@ -449 +449 @@
 static void task_kill_internal(task_t *task)
 {
+        irq_spinlock_lock(&task->lock, false);
+        irq_spinlock_lock(&threads_lock, false);
+        
+        /*
+         * Interrupt all threads.
+         */
+        
         link_t *cur;
-        
-        /*
-         * Interrupt all threads.
-         */
-        irq_spinlock_lock(&task->lock, false);
         for (cur = task->th_head.next; cur != &task->th_head; cur = cur->next) {
                 thread_t *thread = list_get_instance(cur, thread_t, th_link);
@@ -471 +473 @@
         }
         
+        irq_spinlock_unlock(&threads_lock, false);
         irq_spinlock_unlock(&task->lock, false);
 }