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

Timestamp:

2011-02-09T11:46:47Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

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

uspace/app/top/screen.c

@@ -37 +37 @@
 
 #include <stdio.h>
-#include <ipc/ipc.h>
 #include <io/console.h>
 #include <io/style.h>
@@ -47 +46 @@
 #include "top.h"
 
-static ipcarg_t warn_col = 0;
-static ipcarg_t warn_row = 0;
+static sysarg_t warn_col = 0;
+static sysarg_t warn_row = 0;
 
 static void screen_style_normal(void)
@@ -62 +61 @@
 }
 
-static void screen_moveto(ipcarg_t col, ipcarg_t row)
+static void screen_moveto(sysarg_t col, sysarg_t row)
 {
         fflush(stdout);
@@ -68 +67 @@
 }
 
-static void screen_get_pos(ipcarg_t *col, ipcarg_t *row)
+static void screen_get_pos(sysarg_t *col, sysarg_t *row)
 {
         fflush(stdout);
@@ -74 +73 @@
 }
 
-static void screen_get_size(ipcarg_t *col, ipcarg_t *row)
+static void screen_get_size(sysarg_t *col, sysarg_t *row)
 {
         fflush(stdout);
@@ -94 +93 @@
 static void screen_newline(void)
 {
-        ipcarg_t cols;
-        ipcarg_t rows;
+        sysarg_t cols;
+        sysarg_t rows;
         screen_get_size(&cols, &rows);
         
-        ipcarg_t c;
-        ipcarg_t r;
+        sysarg_t c;
+        sysarg_t r;
         screen_get_pos(&c, &r);
         
-        ipcarg_t i;
+        sysarg_t i;
         for (i = c + 1; i < cols; i++)
                 puts(" ");
@@ -142 +141 @@
 static void print_string(const char *str)
 {
-        ipcarg_t cols;
-        ipcarg_t rows;
+        sysarg_t cols;
+        sysarg_t rows;
         screen_get_size(&cols, &rows);
         
-        ipcarg_t c;
-        ipcarg_t r;
+        sysarg_t c;
+        sysarg_t r;
         screen_get_pos(&c, &r);
         
@@ -274 +273 @@
 {
         screen_style_inverted();
-        printf("[taskid] [threads] [virtual] [%%virt] [%%user]"
-            " [%%kernel] [name");
+        printf("[taskid] [thrds] [resident] [%%resi] [virtual] [%%virt]"
+            " [%%user] [%%kern] [name");
         screen_newline();
         screen_style_normal();
@@ -282 +281 @@
 static inline void print_tasks(data_t *data)
 {
-        ipcarg_t cols;
-        ipcarg_t rows;
+        sysarg_t cols;
+        sysarg_t rows;
         screen_get_size(&cols, &rows);
         
-        ipcarg_t col;
-        ipcarg_t row;
+        sysarg_t col;
+        sysarg_t row;
         screen_get_pos(&col, &row);
         
@@ -295 +294 @@
                 perc_task_t *perc = data->tasks_perc + data->tasks_map[i];
                 
+                uint64_t resmem;
+                char resmem_suffix;
+                order_suffix(task->resmem, &resmem, &resmem_suffix);
+                
                 uint64_t virtmem;
                 char virtmem_suffix;
                 order_suffix(task->virtmem, &virtmem, &virtmem_suffix);
                 
-                printf("%-8" PRIu64 " %9zu %8" PRIu64 "%c ", task->task_id,
-                    task->threads, virtmem, virtmem_suffix);
+                printf("%-8" PRIu64 " %7zu %9" PRIu64 "%c ",
+                    task->task_id, task->threads, resmem, resmem_suffix);
+                print_percent(perc->resmem, 2);
+                printf(" %8" PRIu64 "%c ", virtmem, virtmem_suffix);
                 print_percent(perc->virtmem, 2);
                 puts(" ");
                 print_percent(perc->ucycles, 2);
-                puts("   ");
+                puts(" ");
                 print_percent(perc->kcycles, 2);
                 puts(" ");
@@ -329 +334 @@
 static inline void print_ipc(data_t *data)
 {
-        ipcarg_t cols;
-        ipcarg_t rows;
+        sysarg_t cols;
+        sysarg_t rows;
         screen_get_size(&cols, &rows);
         
-        ipcarg_t col;
-        ipcarg_t row;
+        sysarg_t col;
+        sysarg_t row;
         screen_get_pos(&col, &row);
         
@@ -396 +401 @@
 static inline void print_excs(data_t *data)
 {
-        ipcarg_t cols;
-        ipcarg_t rows;
+        sysarg_t cols;
+        sysarg_t rows;
         screen_get_size(&cols, &rows);
         
-        ipcarg_t col;
-        ipcarg_t row;
+        sysarg_t col;
+        sysarg_t row;
         screen_get_pos(&col, &row);
         
@@ -439 +444 @@
 static void print_help(void)
 {
-        ipcarg_t cols;
-        ipcarg_t rows;
+        sysarg_t cols;
+        sysarg_t rows;
         screen_get_size(&cols, &rows);
         
-        ipcarg_t col;
-        ipcarg_t row;
+        sysarg_t col;
+        sysarg_t row;
         screen_get_pos(&col, &row);