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

Timestamp:

2010-07-12T10:53:30Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (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) (1 diff)

uspace/app/top/screen.c

@@ -288 +288 @@
         size_t i;
         for (i = 0; (i < data->tasks_count) && (row < rows); i++, row++) {
+                stats_task_t *task = data->tasks + data->tasks_map[i];
+                perc_task_t *perc = data->tasks_perc + data->tasks_map[i];
+                
                 uint64_t virtmem;
                 char virtmem_suffix;
-                order_suffix(data->tasks[i].virtmem, &virtmem, &virtmem_suffix);
-                
-                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);
+                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(data->tasks_perc[i].ucycles, 2);
+                print_percent(perc->ucycles, 2);
                 puts("   ");
-                print_percent(data->tasks_perc[i].kcycles, 2);
+                print_percent(perc->kcycles, 2);
                 puts(" ");
-                print_string(data->tasks[i].name);
+                print_string(task->name);
                 
                 screen_newline();