Changeset d0c82c5 in mainline for uspace/app

Timestamp:

2010-06-16T19:44:53Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5387807

Parents:

5954241

Message:

perfect CPU cycles accounting, cherry-picked and adopted from lp:~ersin/helenos/measure2

Location:

uspace/app

Files:

• tasks/tasks.c (modified) (1 diff)
• top/screen.c (modified) (1 diff)
• top/top.c (modified) (2 diffs)

uspace/app/tasks/tasks.c

@@ -165 +165 @@
         for (i = 0; i < count; i++) {
                 if (cpus[i].active) {
-                        printf("cpu%u: %" PRIu16 " MHz, busy ticks: "
-                            "%" PRIu64 ", idle ticks: %" PRIu64 "\n",
-                            cpus[i].id, cpus[i].frequency_mhz, cpus[i].busy_ticks,
-                            cpus[i].idle_ticks);
+                        printf("cpu%u: %" PRIu16 " MHz, busy cycles: "
+                            "%" PRIu64 ", idle cycles: %" PRIu64 "\n",
+                            cpus[i].id, cpus[i].frequency_mhz, cpus[i].busy_cycles,
+                            cpus[i].idle_cycles);
                 } else {
                         printf("cpu%u: inactive\n", cpus[i].id);

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);

uspace/app/top/top.c

@@ -175 +175 @@
         }
         
-        /* For each CPU: Compute total ticks and divide it between
+        /* For each CPU: Compute total cycles and divide it between
            user and kernel */
         
@@ -181 +181 @@
         for (i = 0; i < new_data->cpus_count; i++) {
                 uint64_t idle =
-                    new_data->cpus[i].idle_ticks - old_data->cpus[i].idle_ticks;
+                    new_data->cpus[i].idle_cycles - old_data->cpus[i].idle_cycles;
                 uint64_t busy =
-                    new_data->cpus[i].busy_ticks - old_data->cpus[i].busy_ticks;
+                    new_data->cpus[i].busy_cycles - old_data->cpus[i].busy_cycles;
                 uint64_t sum = idle + busy;