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

Timestamp:

2010-07-02T14:19:30Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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

@@ -222 +222 @@
         for (i = 0; i < data->cpus_count; i++) {
                 if (data->cpus[i].active) {
-                        printf("cpu%u (%4" PRIu16 " MHz): busy ticks: "
-                            "%" PRIu64 ", idle ticks: %" PRIu64,
+                        uint64_t busy;
+                        uint64_t idle;
+                        char busy_suffix;
+                        char idle_suffix;
+                        
+                        order_suffix(data->cpus[i].busy_cycles, &busy, &busy_suffix);
+                        order_suffix(data->cpus[i].idle_cycles, &idle, &idle_suffix);
+                        
+                        printf("cpu%u (%4" PRIu16 " MHz): busy cycles: "
+                            "%" PRIu64 "%c, idle cycles: %" PRIu64 "%c",
                             data->cpus[i].id, data->cpus[i].frequency_mhz,
-                            data->cpus[i].busy_ticks, data->cpus[i].idle_ticks);
+                            busy, busy_suffix, idle, idle_suffix);
                         puts(", idle: ");
                         print_percent(data->cpus_perc[i].idle, 2);
@@ -280 +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();