Changeset 07640dfd in mainline for uspace/app/ps/ps.c

Timestamp:

2010-03-29T16:21:29Z (14 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

ea55bc4

Parents:

a2a00e8

Message:

Small changes on kernel & user accounting.

File:

• uspace/app/ps/ps.c (modified) (3 diffs)

uspace/app/ps/ps.c

@@ -70 +70 @@
         }
 
-        printf("      ID  Threads    Pages    [k]Cycles Name\n");
+        printf("      ID  Threads    Pages   [k]uCycles   [k]kCycles  Cycle fault Name\n");
 
         int i;
@@ -76 +76 @@
                 task_info_t taskinfo;
                 get_task_info(tasks[i], &taskinfo);
-                printf("%8llu %8u %8u %12llu %s\n", tasks[i], taskinfo.thread_count, 
-                                taskinfo.pages, taskinfo.cycles / 1000, taskinfo.name);
+                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);
         }
 }
@@ -99 +101 @@
 
         int i;
-        printf("    ID    State  CPU   Prio    [k]Cycles\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\n", threads[i].tid, thread_states[threads[i].state],
-                                threads[i].cpu, threads[i].priority, threads[i].cycles / 1000);
+                printf("%6llu %-8s %4u %6d %12llu %12llu %12llu\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);
         }
 }