Changeset 81c0854f in mainline for uspace/app/top/screen.c

Timestamp:

2011-01-28T12:41:33Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

ba5ab09

Parents:

c2020f7 (diff), ea6a824 (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 from usb/development

File:

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

uspace/app/top/screen.c

@@ -274 +274 @@
 {
         screen_style_inverted();
-        printf("[taskid] [threads] [virtual] [%%virt] [%%user]"
-            " [%%kernel] [name");
+        printf("[taskid] [threads] [resident] [%%resi] [virtual] [%%virt]"
+            " [%%user] [%%kern] [name");
         screen_newline();
         screen_style_normal();
@@ -295 +295 @@
                 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 " %9zu %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(" ");