Changeset 5b7a107 in mainline for kernel/generic/src/proc/thread.c

Timestamp:

2011-01-27T16:52:14Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

875c629

Parents:

bf75e3cb (diff), df58e44 (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:

as the 'btrace' command depends on udebug, make it optional on CONFIG_UDEBUG

File:

• kernel/generic/src/proc/thread.c (modified) (8 diffs)

kernel/generic/src/proc/thread.c

@@ -239 +239 @@
  * Switch thread to the ready state.
  *
- * @param t Thread to make ready.
+ * @param thread Thread to make ready.
  *
  */
@@ -246 +246 @@
         irq_spinlock_lock(&thread->lock, true);
         
-        ASSERT(!(thread->state == Ready));
+        ASSERT(thread->state != Ready);
         
         int i = (thread->priority < RQ_COUNT - 1)
@@ -350 +350 @@
         
 #ifdef CONFIG_UDEBUG
-        /* Init debugging stuff */
+        /* Initialize debugging stuff */
+        thread->btrace = false;
         udebug_thread_initialize(&thread->udebug);
 #endif
@@ -535 +536 @@
 /** Detach thread.
  *
- * Mark the thread as detached, if the thread is already in the Lingering
- * state, deallocate its resources.
+ * Mark the thread as detached. If the thread is already
+ * in the Lingering state, deallocate its resources.
  *
  * @param thread Thread to be detached.
@@ -740 +741 @@
         ASSERT(interrupts_disabled());
         ASSERT(irq_spinlock_locked(&threads_lock));
-
+        
         thread_iterator_t iterator;
         
@@ -751 +752 @@
 }
 
+#ifdef CONFIG_UDEBUG
+
+void thread_stack_trace(thread_id_t thread_id)
+{
+        irq_spinlock_lock(&threads_lock, true);
+        
+        thread_t *thread = thread_find_by_id(thread_id);
+        if (thread == NULL) {
+                printf("No such thread.\n");
+                irq_spinlock_unlock(&threads_lock, true);
+                return;
+        }
+        
+        irq_spinlock_lock(&thread->lock, false);
+        
+        /*
+         * Schedule a stack trace to be printed
+         * just before the thread is scheduled next.
+         *
+         * If the thread is sleeping then try to interrupt
+         * the sleep. Any request for printing an uspace stack
+         * trace from within the kernel should be always
+         * considered a last resort debugging means, therefore
+         * forcing the thread's sleep to be interrupted
+         * is probably justifiable.
+         */
+        
+        bool sleeping = false;
+        istate_t *istate = thread->udebug.uspace_state;
+        if (istate != NULL) {
+                printf("Scheduling thread stack trace.\n");
+                thread->btrace = true;
+                if (thread->state == Sleeping)
+                        sleeping = true;
+        } else
+                printf("Thread interrupt state not available.\n");
+        
+        irq_spinlock_unlock(&thread->lock, false);
+        
+        if (sleeping)
+                waitq_interrupt_sleep(thread);
+        
+        irq_spinlock_unlock(&threads_lock, true);
+}
+
+#endif /* CONFIG_UDEBUG */
 
 /** Process syscall to create new thread.
@@ -793 +840 @@
                                  * has already been created. We need to undo its
                                  * creation now.
-                                 *
                                  */
                                 
@@ -815 +861 @@
                  * THREAD_B events for threads that already existed
                  * and could be detected with THREAD_READ before.
-                 *
                  */
                 udebug_thread_b_event_attach(thread, TASK);