Changeset cefb126 in mainline for uspace/app/tasks/tasks.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/tasks/tasks.c (modified) (1 diff)

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