Changeset be06914 in mainline for uspace/app/top/screen.c

Timestamp:

2010-06-11T12:41:35Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b3b7e14

Parents:

48dcc69

Message:

nicer top printouts
fix typos (recieved → received)

File:

• uspace/app/top/screen.c (modified) (9 diffs)

uspace/app/top/screen.c

@@ -126 +126 @@
 }
 
-static void print_float(fixed_float ffloat, unsigned int precision)
-{
-        printf("%2" PRIu64 ".", ffloat.upper / ffloat.lower);
+static void print_percent(fixed_float ffloat, unsigned int precision)
+{
+        printf("%3" PRIu64 ".", ffloat.upper / ffloat.lower);
         
         unsigned int i;
@@ -136 +136 @@
                 rest = (rest % ffloat.lower) * 10;
         }
+        
+        printf("%%");
+}
+
+static void print_string(const char *str)
+{
+        ipcarg_t cols;
+        ipcarg_t rows;
+        screen_get_size(&cols, &rows);
+        
+        ipcarg_t c;
+        ipcarg_t r;
+        screen_get_pos(&c, &r);
+        
+        if (c < cols)
+                printf("%.*s", cols - c - 1, str);
 }
 
@@ -211 +227 @@
                             data->cpus[i].busy_ticks, data->cpus[i].idle_ticks);
                         puts(", idle: ");
-                        print_float(data->cpus_perc[i].idle, 2);
-                        puts("%, busy: ");
-                        print_float(data->cpus_perc[i].busy, 2);
-                        puts("%");
+                        print_percent(data->cpus_perc[i].idle, 2);
+                        puts(", busy: ");
+                        print_percent(data->cpus_perc[i].busy, 2);
                 } else
                         printf("cpu%u inactive", data->cpus[i].id);
@@ -247 +262 @@
 {
         screen_style_inverted();
-        printf("      ID  Threads      Mem      %%Mem %%uCycles %%kCycles  Name");
+        printf("[taskid] [threads] [virtual] [%%virt] [%%user]"
+            " [%%kernel] [name");
         screen_newline();
         screen_style_normal();
@@ -268 +284 @@
                 order_suffix(data->tasks[i].virtmem, &virtmem, &virtmem_suffix);
                 
-                printf("%8" PRIu64 " %8u %8" PRIu64 "%c ", data->tasks[i].task_id,
+                printf("%-8" PRIu64 " %9u %8" PRIu64 "%c ", data->tasks[i].task_id,
                     data->tasks[i].threads, virtmem, virtmem_suffix);
+                print_percent(data->tasks_perc[i].virtmem, 2);
+                puts(" ");
+                print_percent(data->tasks_perc[i].ucycles, 2);
                 puts("   ");
-                print_float(data->tasks_perc[i].virtmem, 2);
-                puts("%   ");
-                print_float(data->tasks_perc[i].ucycles, 2);
-                puts("%   ");
-                print_float(data->tasks_perc[i].kcycles, 2);
-                printf("%% %s", data->tasks[i].name);
+                print_percent(data->tasks_perc[i].kcycles, 2);
+                puts(" ");
+                print_string(data->tasks[i].name);
                 
                 screen_newline();
@@ -290 +306 @@
 {
         screen_style_inverted();
-        printf("      ID Calls sent Calls recv Answs sent Answs recv  IRQn recv       Forw Name");
+        printf("[taskid] [cls snt] [cls rcv] [ans snt]"
+            " [ans rcv] [irq rcv] [forward] [name");
         screen_newline();
         screen_style_normal();
@@ -307 +324 @@
         size_t i;
         for (i = 0; (i < data->tasks_count) && (row < rows); i++, row++) {
-                printf("%8" PRIu64 " %10" PRIu64 " %10" PRIu64 " %10" PRIu64
-                     " %10" PRIu64 " %10" PRIu64 " %10" PRIu64 " %s",
-                     data->tasks[i].task_id, data->tasks[i].ipc_info.call_sent,
-                     data->tasks[i].ipc_info.call_recieved,
-                     data->tasks[i].ipc_info.answer_sent,
-                     data->tasks[i].ipc_info.answer_recieved,
-                     data->tasks[i].ipc_info.irq_notif_recieved,
-                     data->tasks[i].ipc_info.forwarded, data->tasks[i].name);
+                uint64_t call_sent;
+                uint64_t call_received;
+                uint64_t answer_sent;
+                uint64_t answer_received;
+                uint64_t irq_notif_received;
+                uint64_t forwarded;
+                
+                char call_sent_suffix;
+                char call_received_suffix;
+                char answer_sent_suffix;
+                char answer_received_suffix;
+                char irq_notif_received_suffix;
+                char forwarded_suffix;
+                
+                order_suffix(data->tasks[i].ipc_info.call_sent, &call_sent,
+                    &call_sent_suffix);
+                order_suffix(data->tasks[i].ipc_info.call_received,
+                    &call_received, &call_received_suffix);
+                order_suffix(data->tasks[i].ipc_info.answer_sent,
+                    &answer_sent, &answer_sent_suffix);
+                order_suffix(data->tasks[i].ipc_info.answer_received,
+                    &answer_received, &answer_received_suffix);
+                order_suffix(data->tasks[i].ipc_info.irq_notif_received,
+                    &irq_notif_received, &irq_notif_received_suffix);
+                order_suffix(data->tasks[i].ipc_info.forwarded, &forwarded,
+                    &forwarded_suffix);
+                
+                printf("%-8" PRIu64 " %8" PRIu64 "%c %8" PRIu64 "%c"
+                     " %8" PRIu64 "%c %8" PRIu64 "%c %8" PRIu64 "%c"
+                     " %8" PRIu64 "%c ", data->tasks[i].task_id,
+                     call_sent, call_sent_suffix,
+                     call_received, call_received_suffix,
+                     answer_sent, answer_sent_suffix,
+                     answer_received, answer_received_suffix,
+                     irq_notif_received, irq_notif_received_suffix,
+                     forwarded, forwarded_suffix);
+                print_string(data->tasks[i].name);
                 
                 screen_newline();
@@ -328 +374 @@
 {
         screen_style_inverted();
-        printf("  ID                     Desc    Count   Cycles");
+        printf("[exc   ] [count   ] [%%count] [cycles  ] [%%cycles] [description");
         screen_newline();
         screen_style_normal();
@@ -345 +391 @@
         size_t i;
         for (i = 0; (i < data->exceptions_count) && (row < rows); i++, row++) {
+                uint64_t count;
                 uint64_t cycles;
-                char suffix;
-                
-                order_suffix(data->exceptions[i].cycles, &cycles, &suffix);
-                printf("%8u %20s %8" PRIu64 " %8" PRIu64 "%c",
-                     data->exceptions[i].id, data->exceptions[i].desc,
-                     data->exceptions[i].count, cycles, suffix);
+                
+                char count_suffix;
+                char cycles_suffix;
+                
+                order_suffix(data->exceptions[i].count, &count, &count_suffix);
+                order_suffix(data->exceptions[i].cycles, &cycles, &cycles_suffix);
+                
+                printf("%-8u %9" PRIu64 "%c  ",
+                     data->exceptions[i].id, count, count_suffix);
+                print_percent(data->exceptions_perc[i].count, 2);
+                printf(" %9" PRIu64 "%c   ", cycles, cycles_suffix);
+                print_percent(data->exceptions_perc[i].cycles, 2);
+                puts(" ");
+                print_string(data->exceptions[i].desc);
                 
                 screen_newline();