Changeset 2b96463 in mainline for uspace/app/top/screen.c

Timestamp:

2011-01-28T15:15:11Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3ee48f2, 7a51d75

Parents:

ef8d655 (diff), ae0300b5 (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

File:

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

uspace/app/top/screen.c

@@ -274 +274 @@
 {
         screen_style_inverted();
-        printf("[taskid] [threads] [resident] [%%resi] [virtual] [%%virt]"
+        printf("[taskid] [thrds] [resident] [%%resi] [virtual] [%%virt]"
             " [%%user] [%%kern] [name");
         screen_newline();
@@ -303 +303 @@
                 order_suffix(task->virtmem, &virtmem, &virtmem_suffix);
                 
-                printf("%-8" PRIu64 " %9zu %9" PRIu64 "%c ",
+                printf("%-8" PRIu64 " %7zu %9" PRIu64 "%c ",
                     task->task_id, task->threads, resmem, resmem_suffix);
                 print_percent(perc->resmem, 2);