Changeset ea55bc4 in mainline

Timestamp:

2010-03-29T16:44:12Z (15 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

3a10e34

Parents:

07640dfd

Message:

cycles count echoing with suffixes

Location:

uspace/app/ps

Files:

• Makefile (modified) (1 diff)
• func.c (added)
• func.h (added)
• ps.c (modified) (4 diffs)

uspace/app/ps/Makefile

@@ -32 +32 @@
 
 SOURCES = \
-        ps.c
+        ps.c \
+        func.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/ps/ps.c

@@ -41 +41 @@
 #include <errno.h>
 #include <stdlib.h>
-/* #include <string.h> */
 #include <malloc.h>
+
+#include "func.h"
 
 #define TASK_COUNT 10
@@ -70 +71 @@
         }
 
-        printf("      ID  Threads    Pages   [k]uCycles   [k]kCycles  Cycle fault Name\n");
+        printf("      ID  Threads    Pages       uCycles       kCycles   Cycle fault Name\n");
 
         int i;
@@ -76 +77 @@
                 task_info_t taskinfo;
                 get_task_info(tasks[i], &taskinfo);
-                printf("%8llu %8u %8u %12llu %12llu %12llu %s\n", tasks[i],
-                                taskinfo.thread_count, taskinfo.pages, taskinfo.ucycles / 1000,
-                                taskinfo.kcycles / 1000, (taskinfo.ucycles + taskinfo.kcycles) -
-                                taskinfo.cycles, taskinfo.name);
+                uint64_t ucycles, kcycles, fault;
+                char usuffix, ksuffix, fsuffix;
+                order(taskinfo.ucycles, &ucycles, &usuffix);
+                order(taskinfo.kcycles, &kcycles, &ksuffix);
+                order((taskinfo.kcycles + taskinfo.ucycles) - taskinfo.cycles, &fault, &fsuffix);
+                printf("%8llu %8u %8u %12llu%c %12llu%c %12llu%c %s\n", tasks[i],
+                        taskinfo.thread_count, taskinfo.pages, ucycles, usuffix,
+                        kcycles, ksuffix, fault, fsuffix, taskinfo.name);
         }
 }
@@ -101 +106 @@
 
         int i;
-        printf("    ID    State  CPU   Prio   [k]uCycles   [k]kcycles  Cycle fault\n");
+        printf("    ID    State  CPU   Prio    [k]uCycles    [k]kcycles   Cycle fault\n");
         for (i = 0; i < result; ++i) {
-                printf("%6llu %-8s %4u %6d %12llu %12llu %12llu\n", threads[i].tid,
+                uint64_t ucycles, kcycles, fault;
+                char usuffix, ksuffix, fsuffix;
+                order(threads[i].ucycles, &ucycles, &usuffix);
+                order(threads[i].kcycles, &kcycles, &ksuffix);
+                order((threads[i].kcycles + threads[i].ucycles) - threads[i].cycles, &fault, &fsuffix);
+                printf("%6llu %-8s %4u %6d %12llu%c %12llu%c %12llu%c\n", threads[i].tid,
                         thread_states[threads[i].state], threads[i].cpu,
-                        threads[i].priority, threads[i].ucycles / 1000,
-                        threads[i].kcycles / 1000,
-                        threads[i].ucycles + threads[i].kcycles - threads[i].cycles);
+                        threads[i].priority, ucycles, usuffix,
+                        kcycles, ksuffix, fault, fsuffix);
         }
 }