Changeset 48dcc69 in mainline

Timestamp:

2010-06-11T10:52:57Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

be06914

Parents:

c0f13d2

Message:

better printouts for threads

Location:

kernel/generic

Files:

• include/proc/thread.h (modified) (1 diff)
• src/console/cmd.c (modified) (4 diffs)
• src/proc/task.c (modified) (1 diff)
• src/proc/thread.c (modified) (4 diffs)

kernel/generic/include/proc/thread.h

@@ -240 +240 @@
 
 extern void thread_register_call_me(void (*)(void *), void *);
-extern void thread_print_list(void);
+extern void thread_print_list(bool);
 extern void thread_destroy(thread_t *, bool);
 extern thread_t *thread_find_by_id(thread_id_t);

kernel/generic/src/console/cmd.c

@@ -355 +355 @@
 };
 
+static char flag_buf[MAX_CMDLINE + 1];
+
 static int cmd_threads(cmd_arg_t *argv);
+static cmd_arg_t threads_argv = {
+        .type = ARG_TYPE_STRING_OPTIONAL,
+        .buffer = flag_buf,
+        .len = sizeof(flag_buf)
+};
 static cmd_info_t threads_info = {
         .name = "threads",
-        .description = "List all threads.",
+        .description = "List all threads (use -a for additional information).",
         .func = cmd_threads,
-        .argc = 0
-};
-
+        .argc = 1,
+        .argv = &threads_argv
+};
 
 static int cmd_tasks(cmd_arg_t *argv);
-static char tasks_buf[MAX_CMDLINE + 1];
-
 static cmd_arg_t tasks_argv = {
         .type = ARG_TYPE_STRING_OPTIONAL,
-        .buffer = tasks_buf,
-        .len = sizeof(tasks_buf)
+        .buffer = flag_buf,
+        .len = sizeof(flag_buf)
 };
 static cmd_info_t tasks_info = {
@@ -923 +928 @@
 /** Command for listings Thread information
  *
- * @param argv Ignores
+ * @param argv Ignored
  *
  * @return Always 1
  */
-int cmd_threads(cmd_arg_t * argv)
-{
-        thread_print_list();
+int cmd_threads(cmd_arg_t *argv)
+{
+        if (str_cmp(flag_buf, "-a") == 0)
+                thread_print_list(true);
+        else if (str_cmp(flag_buf, "") == 0)
+                thread_print_list(false);
+        else
+                printf("Unknown argument \"%s\".\n", flag_buf);
+        
         return 1;
 }
@@ -935 +946 @@
 /** Command for listings Task information
  *
- * @param argv Ignores
+ * @param argv Ignored
  *
  * @return Always 1
@@ -941 +952 @@
 int cmd_tasks(cmd_arg_t *argv)
 {
-        if (str_cmp(tasks_buf, "-a") == 0)
+        if (str_cmp(flag_buf, "-a") == 0)
                 task_print_list(true);
-        else if (str_cmp(tasks_buf, "") == 0)
+        else if (str_cmp(flag_buf, "") == 0)
                 task_print_list(false);
         else
-                printf("Unknown argument \"%s\".\n", tasks_buf);
+                printf("Unknown argument \"%s\".\n", flag_buf);
         
         return 1;

kernel/generic/src/proc/task.c

@@ -522 +522 @@
 #ifdef __32_BITS__
         if (additional)
-                printf("[taskid] [threads] [calls] [callee\n");
+                printf("[id    ] [threads] [calls] [callee\n");
         else
-                printf("[taskid] [name        ] [ctx] [address ] [as      ]"
+                printf("[id    ] [name        ] [ctx] [address ] [as      ]"
                     " [ucycles ] [kcycles ]\n");
 #endif

kernel/generic/src/proc/thread.c

@@ -605 +605 @@
 static bool thread_walker(avltree_node_t *node, void *arg)
 {
+        bool *additional = (bool *) arg;
         thread_t *thread = avltree_get_instance(node, thread_t, threads_tree_node);
         
@@ -613 +614 @@
         
 #ifdef __32_BITS__
-        printf("%-6" PRIu64" %-10s %10p %-8s %10p %-3" PRIu32 " %10p %10p %9"
-                PRIu64 "%c %9" PRIu64 "%c ", thread->tid, thread->name, thread,
-                thread_states[thread->state], thread->task, thread->task->context,
-                thread->thread_code, thread->kstack, ucycles, usuffix, kcycles, ksuffix);
+        if (*additional)
+                printf("%-8" PRIu64" %10p %9" PRIu64 "%c %9" PRIu64 "%c ",
+                    thread->tid, 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],
+                    thread->task, thread->task->context, thread->thread_code);
 #endif
         
 #ifdef __64_BITS__
-        printf("%-6" PRIu64" %-10s %18p %-8s %18p %-3" PRIu32 " %18p %18p %9"
-                PRIu64 "%c %9" PRIu64 "%c ", thread->tid, thread->name, thread,
-                thread_states[thread->state], thread->task, thread->task->context,
-                thread->thread_code, thread->kstack, ucycles, usuffix, kcycles, ksuffix);
-#endif
-        
-        if (thread->cpu)
-                printf("%-4u", thread->cpu->id);
+        if (*additional)
+                printf("%-8" PRIu64" %18p %18p\n"
+                    "         %9" PRIu64 "%c %9" PRIu64 "%c ",
+                    thread->tid, thread->thread_code, thread->kstack,
+                    ucycles, usuffix, kcycles, ksuffix);
         else
-                printf("none");
-        
-        if (thread->state == Sleeping) {
+                printf("%-8" PRIu64" %-14s %18p %-8s %18p %-5" PRIu32 "\n",
+                    thread->tid, thread->name, thread, thread_states[thread->state],
+                    thread->task, thread->task->context);
+#endif
+        
+        if (*additional) {
+                if (thread->cpu)
+                        printf("%-5u", thread->cpu->id);
+                else
+                        printf("none ");
+                
+                if (thread->state == Sleeping) {
 #ifdef __32_BITS__
-                printf(" %10p", thread->sleep_queue);
-#endif
+                        printf(" %10p", thread->sleep_queue);
+#endif
+                        
+#ifdef __64_BITS__
+                        printf(" %18p", thread->sleep_queue);
+#endif
+                }
                 
-#ifdef __64_BITS__
-                printf(" %18p", thread->sleep_queue);
-#endif
+                printf("\n");
         }
         
-        printf("\n");
-        
         return true;
 }
@@ -648 +660 @@
 /** Print list of threads debug info
  *
- */
-void thread_print_list(void)
+ * @param additional Print additional information.
+ *
+ */
+void thread_print_list(bool additional)
 {
         /* Messing with thread structures, avoid deadlock */
@@ -655 +669 @@
         
 #ifdef __32_BITS__
-        printf("tid    name       address    state    task       "
-                "ctx code       stack      ucycles    kcycles    cpu  "
-                "waitqueue\n");
-        printf("------ ---------- ---------- -------- ---------- "
-                "--- ---------- ---------- ---------- ---------- ---- "
-                "----------\n");
+        if (additional)
+                printf("[id    ] [stack   ] [ucycles ] [kcycles ] [cpu]"
+                    " [waitqueue]\n");
+        else
+                printf("[id    ] [name        ] [address ] [state ] [task    ]"
+                    " [ctx] [code    ]\n");
 #endif
         
 #ifdef __64_BITS__
-        printf("tid    name       address            state    task               "
-                "ctx code               stack              ucycles    kcycles    cpu  "
-                "waitqueue\n");
-        printf("------ ---------- ------------------ -------- ------------------ "
-                "--- ------------------ ------------------ ---------- ---------- ---- "
-                "------------------\n");
-#endif
-        
-        avltree_walk(&threads_tree, thread_walker, NULL);
+        if (additional) {
+                printf("[id    ] [code            ] [stack           ]\n"
+                    "         [ucycles ] [kcycles ] [cpu] [waitqueue       ]\n");
+        } else
+                printf("[id    ] [name        ] [address         ] [state ]"
+                    " [task            ] [ctx]\n");
+#endif
+        
+        avltree_walk(&threads_tree, thread_walker, &additional);
         
         irq_spinlock_unlock(&threads_lock, true);