Changes in kernel/generic/src/proc/thread.c [df58e44:577f042a] in mainline

File:

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

kernel/generic/src/proc/thread.c

@@ -338 +338 @@
         
         thread->interrupted = false;
-        thread->btrace = false;
         thread->detached = false;
         waitq_initialize(&thread->join_wq);
@@ -351 +350 @@
         
 #ifdef CONFIG_UDEBUG
-        /* Init debugging stuff */
+        /* Initialize debugging stuff */
+        thread->btrace = false;
         udebug_thread_initialize(&thread->udebug);
 #endif
@@ -591 +591 @@
         order_suffix(thread->kcycles, &kcycles, &ksuffix);
         
+        char *name;
+        if (str_cmp(thread->name, "uinit") == 0)
+                name = thread->task->name;
+        else
+                name = thread->name;
+        
 #ifdef __32_BITS__
         if (*additional)
-                printf("%-8" PRIu64" %10p %9" PRIu64 "%c %9" PRIu64 "%c ",
-                    thread->tid, thread->kstack, ucycles, usuffix,
-                    kcycles, ksuffix);
+                printf("%-8 %10p" PRIu64" %10p %9" PRIu64 "%c %9" PRIu64 "%c ",
+                    thread->tid, thread->thread_code, thread->kstack,
+                    ucycles, usuffix, kcycles, ksuffix);
         else
-                printf("%-8" PRIu64" %-14s %10p %-8s %10p %-5" PRIu32 " %10p\n",
-                    thread->tid, thread->name, thread, thread_states[thread->state],
+                printf("%-8" PRIu64" %-14s %10p %-8s %10p %-5" PRIu32 "\n",
+                    thread->tid, name, thread, thread_states[thread->state],
                     thread->task, thread->task->context, thread->thread_code);
 #endif
@@ -610 +616 @@
         else
                 printf("%-8" PRIu64" %-14s %18p %-8s %18p %-5" PRIu32 "\n",
-                    thread->tid, thread->name, thread, thread_states[thread->state],
+                    thread->tid, name, thread, thread_states[thread->state],
                     thread->task, thread->task->context);
 #endif
@@ -648 +654 @@
 #ifdef __32_BITS__
         if (additional)
-                printf("[id    ] [stack   ] [ucycles ] [kcycles ] [cpu]"
-                    " [waitqueue]\n");
+                printf("[id    ] [code    ] [stack   ] [ucycles ] [kcycles ]"
+                    " [cpu] [waitqueue]\n");
         else
                 printf("[id    ] [name        ] [address ] [state ] [task    ]"
-                    " [ctx] [code    ]\n");
+                    " [ctx]\n");
 #endif
         
@@ -751 +757 @@
         return iterator.thread;
 }
+
+#ifdef CONFIG_UDEBUG
 
 void thread_stack_trace(thread_id_t thread_id)
@@ -794 +802 @@
         irq_spinlock_unlock(&threads_lock, true);
 }
+
+#endif /* CONFIG_UDEBUG */
 
 /** Process syscall to create new thread.