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

Timestamp:

2010-06-10T16:04:07Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

48dcc69

Parents:

8eec3c8

Message:

introduce more compact and more readable command output to kconsole (suitable even for 80-column screens)

File:

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

kernel/generic/src/proc/task.c

@@ -465 +465 @@
 static bool task_print_walker(avltree_node_t *node, void *arg)
 {
+        bool *additional = (bool *) arg;
         task_t *task = avltree_get_instance(node, task_t, tasks_tree_node);
         irq_spinlock_lock(&task->lock, false);
@@ -476 +477 @@
         
 #ifdef __32_BITS__
-        printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %10p %10p %9" PRIu64 "%c %9"
-            PRIu64 "%c %7ld %6ld", task->taskid, task->name, task->context,
-            task, task->as, ucycles, usuffix, kcycles, ksuffix,
-            atomic_get(&task->refcount), atomic_get(&task->active_calls));
+        if (*additional)
+                printf("%-8" PRIu64 " %9ld %7ld", task->taskid,
+                    atomic_get(&task->refcount), atomic_get(&task->active_calls));
+        else
+                printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %10p %10p"
+                    " %9" PRIu64 "%c %9" PRIu64 "%c\n", task->taskid,
+                    task->name, task->context, task, task->as,
+                    ucycles, usuffix, kcycles, ksuffix);
 #endif
         
 #ifdef __64_BITS__
-        printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %18p %18p %9" PRIu64 "%c %9"
-            PRIu64 "%c %7ld %6ld", task->taskid, task->name, task->context,
-            task, task->as, ucycles, usuffix, kcycles, ksuffix,
-            atomic_get(&task->refcount), atomic_get(&task->active_calls));
-#endif
-        
-        size_t i;
-        for (i = 0; i < IPC_MAX_PHONES; i++) {
-                if (task->phones[i].callee)
-                        printf(" %" PRIs ":%p", i, task->phones[i].callee);
+        if (*additional)
+                printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c %9ld %7ld",
+                    task->taskid, ucycles, usuffix, kcycles, ksuffix,
+                    atomic_get(&task->refcount), atomic_get(&task->active_calls));
+        else
+                printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %18p %18p\n",
+                    task->taskid, task->name, task->context, task, task->as);
+#endif
+        
+        if (*additional) {
+                size_t i;
+                for (i = 0; i < IPC_MAX_PHONES; i++) {
+                        if (task->phones[i].callee)
+                                printf(" %" PRIs ":%p", i, task->phones[i].callee);
+                }
+                printf("\n");
         }
-        printf("\n");
         
         irq_spinlock_unlock(&task->lock, false);
@@ -500 +510 @@
 }
 
-/** Print task list */
-void task_print_list(void)
+/** Print task list
+ *
+ * @param additional Print additional information.
+ *
+ */
+void task_print_list(bool additional)
 {
         /* Messing with task structures, avoid deadlock */
@@ -507 +521 @@
         
 #ifdef __32_BITS__
-        printf("taskid name         ctx address    as        "
-            " ucycles    kcycles    threads calls  callee\n");
-        printf("------ ------------ --- ---------- ----------"
-            " ---------- ---------- ------- ------ ------>\n");
+        if (additional)
+                printf("[taskid] [threads] [calls] [callee\n");
+        else
+                printf("[taskid] [name        ] [ctx] [address ] [as      ]"
+                    " [ucycles ] [kcycles ]\n");
 #endif
         
 #ifdef __64_BITS__
-        printf("taskid name         ctx address            as                "
-            " ucycles    kcycles    threads calls  callee\n");
-        printf("------ ------------ --- ------------------ ------------------"
-            " ---------- ---------- ---------- ------- ------ ------>\n");
-#endif
-        
-        avltree_walk(&tasks_tree, task_print_walker, NULL);
+        if (additional)
+                printf("[taskid] [ucycles ] [kcycles ] [threads] [calls]"
+                    " [callee\n");
+        else
+                printf("[taskid] [name        ] [ctx] [address         ]"
+                    " [as              ]\n");
+#endif
+        
+        avltree_walk(&tasks_tree, task_print_walker, &additional);
         
         irq_spinlock_unlock(&tasks_lock, true);