Changes in uspace/app/top/screen.c [933cadf:172aad6] in mainline

File:

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

uspace/app/top/screen.c

@@ -37 +37 @@
 
 #include <stdio.h>
+#include <ipc/ipc.h>
 #include <io/console.h>
 #include <io/style.h>
@@ -46 +47 @@
 #include "top.h"
 
-static sysarg_t warn_col = 0;
-static sysarg_t warn_row = 0;
+static ipcarg_t warn_col = 0;
+static ipcarg_t warn_row = 0;
 
 static void screen_style_normal(void)
@@ -61 +62 @@
 }
 
-static void screen_moveto(sysarg_t col, sysarg_t row)
+static void screen_moveto(ipcarg_t col, ipcarg_t row)
 {
         fflush(stdout);
@@ -67 +68 @@
 }
 
-static void screen_get_pos(sysarg_t *col, sysarg_t *row)
+static void screen_get_pos(ipcarg_t *col, ipcarg_t *row)
 {
         fflush(stdout);
@@ -73 +74 @@
 }
 
-static void screen_get_size(sysarg_t *col, sysarg_t *row)
+static void screen_get_size(ipcarg_t *col, ipcarg_t *row)
 {
         fflush(stdout);
@@ -93 +94 @@
 static void screen_newline(void)
 {
-        sysarg_t cols;
-        sysarg_t rows;
+        ipcarg_t cols;
+        ipcarg_t rows;
         screen_get_size(&cols, &rows);
         
-        sysarg_t c;
-        sysarg_t r;
+        ipcarg_t c;
+        ipcarg_t r;
         screen_get_pos(&c, &r);
         
-        sysarg_t i;
+        ipcarg_t i;
         for (i = c + 1; i < cols; i++)
                 puts(" ");
@@ -141 +142 @@
 static void print_string(const char *str)
 {
-        sysarg_t cols;
-        sysarg_t rows;
+        ipcarg_t cols;
+        ipcarg_t rows;
         screen_get_size(&cols, &rows);
         
-        sysarg_t c;
-        sysarg_t r;
+        ipcarg_t c;
+        ipcarg_t r;
         screen_get_pos(&c, &r);
         
-        if (c < cols) {
-                int pos = cols - c - 1;
-                printf("%.*s", pos, str);
-        }
+        if (c < cols)
+                printf("%.*s", cols - c - 1, str);
 }
 
 static inline void print_global_head(data_t *data)
 {
-        printf("top - %02lu:%02lu:%02lu up "
-            "%" PRIun " days, %02" PRIun ":%02" PRIun ":%02" PRIun ", "
-            "load average:",
+        printf("top - %02lu:%02lu:%02lu up %u days, %02u:%02u:%02u, load average:",
             data->hours, data->minutes, data->seconds,
             data->udays, data->uhours, data->uminutes, data->useconds);
@@ -174 +171 @@
 static inline void print_task_summary(data_t *data)
 {
-        printf("tasks: %zu total", data->tasks_count);
+        printf("tasks: %u total", data->tasks_count);
         screen_newline();
 }
@@ -214 +211 @@
         }
         
-        printf("threads: %zu total, %zu running, %zu ready, "
-            "%zu sleeping, %zu lingering, %zu other, %zu invalid",
+        printf("threads: %u total, %u running, %u ready, %u sleeping, %u lingering, "
+            "%u other, %u invalid",
             total, running, ready, sleeping, lingering, other, invalid);
         screen_newline();
@@ -254 +251 @@
         uint64_t used;
         uint64_t free;
-        const char *total_suffix;
-        const char *unavail_suffix;
-        const char *used_suffix;
-        const char *free_suffix;
-        
-        bin_order_suffix(data->physmem->total, &total, &total_suffix, false);
-        bin_order_suffix(data->physmem->unavail, &unavail, &unavail_suffix, false);
-        bin_order_suffix(data->physmem->used, &used, &used_suffix, false);
-        bin_order_suffix(data->physmem->free, &free, &free_suffix, false);
-        
-        printf("memory: %" PRIu64 "%s total, %" PRIu64 "%s unavail, %"
-            PRIu64 "%s used, %" PRIu64 "%s free", total, total_suffix,
+        char total_suffix;
+        char unavail_suffix;
+        char used_suffix;
+        char free_suffix;
+        
+        order_suffix(data->physmem->total, &total, &total_suffix);
+        order_suffix(data->physmem->unavail, &unavail, &unavail_suffix);
+        order_suffix(data->physmem->used, &used, &used_suffix);
+        order_suffix(data->physmem->free, &free, &free_suffix);
+        
+        printf("memory: %" PRIu64 "%c total, %" PRIu64 "%c unavail, %"
+            PRIu64 "%c used, %" PRIu64 "%c free", total, total_suffix,
             unavail, unavail_suffix, used, used_suffix, free, free_suffix);
         screen_newline();
@@ -273 +270 @@
 {
         screen_style_inverted();
-        printf("[taskid] [thrds] [resident] [%%resi] [virtual] [%%virt]"
-            " [%%user] [%%kern] [name");
+        printf("[taskid] [threads] [virtual] [%%virt] [%%user]"
+            " [%%kernel] [name");
         screen_newline();
         screen_style_normal();
@@ -281 +278 @@
 static inline void print_tasks(data_t *data)
 {
-        sysarg_t cols;
-        sysarg_t rows;
+        ipcarg_t cols;
+        ipcarg_t rows;
         screen_get_size(&cols, &rows);
         
-        sysarg_t col;
-        sysarg_t row;
+        ipcarg_t col;
+        ipcarg_t row;
         screen_get_pos(&col, &row);
         
@@ -294 +291 @@
                 perc_task_t *perc = data->tasks_perc + data->tasks_map[i];
                 
-                uint64_t resmem;
-                const char *resmem_suffix;
-                bin_order_suffix(task->resmem, &resmem, &resmem_suffix, true);
-                
                 uint64_t virtmem;
-                const char *virtmem_suffix;
-                bin_order_suffix(task->virtmem, &virtmem, &virtmem_suffix, true);
-                
-                printf("%-8" PRIu64 " %7zu %7" PRIu64 "%s ",
-                    task->task_id, task->threads, resmem, resmem_suffix);
-                print_percent(perc->resmem, 2);
-                printf(" %6" PRIu64 "%s ", virtmem, virtmem_suffix);
+                char virtmem_suffix;
+                order_suffix(task->virtmem, &virtmem, &virtmem_suffix);
+                
+                printf("%-8" PRIu64 " %9u %8" PRIu64 "%c ", task->task_id,
+                    task->threads, virtmem, virtmem_suffix);
                 print_percent(perc->virtmem, 2);
                 puts(" ");
                 print_percent(perc->ucycles, 2);
-                puts(" ");
+                puts("   ");
                 print_percent(perc->kcycles, 2);
                 puts(" ");
@@ -334 +325 @@
 static inline void print_ipc(data_t *data)
 {
-        sysarg_t cols;
-        sysarg_t rows;
+        ipcarg_t cols;
+        ipcarg_t rows;
         screen_get_size(&cols, &rows);
         
-        sysarg_t col;
-        sysarg_t row;
+        ipcarg_t col;
+        ipcarg_t row;
         screen_get_pos(&col, &row);
         
@@ -401 +392 @@
 static inline void print_excs(data_t *data)
 {
-        sysarg_t cols;
-        sysarg_t rows;
+        ipcarg_t cols;
+        ipcarg_t rows;
         screen_get_size(&cols, &rows);
         
-        sysarg_t col;
-        sysarg_t row;
+        ipcarg_t col;
+        ipcarg_t row;
         screen_get_pos(&col, &row);
         
@@ -444 +435 @@
 static void print_help(void)
 {
-        sysarg_t cols;
-        sysarg_t rows;
+        ipcarg_t cols;
+        ipcarg_t rows;
         screen_get_size(&cols, &rows);
         
-        sysarg_t col;
-        sysarg_t row;
+        ipcarg_t col;
+        ipcarg_t row;
         screen_get_pos(&col, &row);