Changeset 07640dfd in mainline for kernel/generic/src/proc

Timestamp:

2010-03-29T16:21:29Z (15 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.

Location:

kernel/generic/src/proc

Files:

• task.c (modified) (3 diffs)
• thread.c (modified) (3 diffs)

kernel/generic/src/proc/task.c

@@ -427 +427 @@
 
 #ifdef __32_BITS__      
-        printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %10p %10p %9" PRIu64 "%c %9" PRIu64 "%c %9"
-                PRIu64 "%c %7ld %6ld", t->taskid, t->name, t->context, t, t->as, cycles, suffix,
+        printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %10p %10p %9" PRIu64 "%c %9"
+                PRIu64 "%c %7ld %6ld", t->taskid, t->name, t->context, t, t->as,
                 ucycles, usuffix, kcycles, ksuffix, atomic_get(&t->refcount),
                 atomic_get(&t->active_calls));
@@ -434 +434 @@
 
 #ifdef __64_BITS__
-        printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %18p %18p %9" PRIu64 "%c %9" PRIu64 "%c %9"
-                PRIu64 "%c %7ld %6ld", t->taskid, t->name, t->context, t, t->as, cycles, suffix,
+        printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %18p %18p %9" PRIu64 "%c %9"
+                PRIu64 "%c %7ld %6ld", t->taskid, t->name, t->context, t, t->as,
                 ucycles, usuffix, kcycles, ksuffix, atomic_get(&t->refcount),
                 atomic_get(&t->active_calls));
@@ -461 +461 @@
 #ifdef __32_BITS__      
         printf("taskid name         ctx address    as        "
-            " cycles     ucycles    kcycles    threads calls  callee\n");
+            " ucycles    kcycles    threads calls  callee\n");
         printf("------ ------------ --- ---------- ----------"
-            " ---------- ---------- ---------- ------- ------ ------>\n");
+            " ---------- ---------- ------- ------ ------>\n");
 #endif
 
 #ifdef __64_BITS__
         printf("taskid name         ctx address            as                "
-            " cycles     ucycles    kcycles    threads calls  callee\n");
+            " ucycles    kcycles    threads calls  callee\n");
         printf("------ ------------ --- ------------------ ------------------"
-            " ---------- ---------- ---------- ---------- ------- ------ ------>\n");
+            " ---------- ---------- ---------- ------- ------ ------>\n");
 #endif
 

kernel/generic/src/proc/thread.c

@@ -630 +630 @@
 
 #ifdef __32_BITS__
-        printf("%-6" PRIu64" %-10s %10p %-8s %10p %-3" PRIu32 " %10p %10p %9" PRIu64 "%c %9" PRIu64 "%c %9" PRIu64 "%c ",
-            t->tid, t->name, t, thread_states[t->state], t->task,
-        t->task->context, t->thread_code, t->kstack, cycles, suffix, ucycles, usuffix, kcycles, ksuffix);
+        printf("%-6" PRIu64" %-10s %10p %-8s %10p %-3" PRIu32 " %10p %10p %9"
+                PRIu64 "%c %9" PRIu64 "%c ", t->tid, t->name, t,
+                thread_states[t->state], t->task, t->task->context, t->thread_code,
+                t->kstack, ucycles, usuffix, kcycles, ksuffix);
 #endif
 
 #ifdef __64_BITS__
-        printf("%-6" PRIu64" %-10s %18p %-8s %18p %-3" PRIu32 " %18p %18p %9" PRIu64 "%c %9" PRIu64 "%c %9" PRIu64 "%c ",
-            t->tid, t->name, t, thread_states[t->state], t->task,
-        t->task->context, t->thread_code, t->kstack, cycles, suffix, ucycles, usuffix, kcycles, ksuffix);
+        printf("%-6" PRIu64" %-10s %18p %-8s %18p %-3" PRIu32 " %18p %18p %9"
+                PRIu64 "%c %9" PRIu64 "%c ", t->tid, t->name, t,
+                thread_states[t->state], t->task, t->task->context, t->thread_code,
+                t->kstack, ucycles, usuffix, kcycles, ksuffix);
 #endif
                         
@@ -672 +674 @@
 #ifdef __32_BITS__      
         printf("tid    name       address    state    task       "
-                "ctx code       stack      cycles     ucycles    kcycles    cpu  "
+                "ctx code       stack      ucycles    kcycles    cpu  "
                 "waitqueue\n");
         printf("------ ---------- ---------- -------- ---------- "
-                "--- ---------- ---------- ---------- ---------- ---------- ---- "
+                "--- ---------- ---------- ---------- ---------- ---- "
                 "----------\n");
 #endif
@@ -681 +683 @@
 #ifdef __64_BITS__
         printf("tid    name       address            state    task               "
-                "ctx code               stack              cycles     ucycles    kcycles    cpu  "
+                "ctx code               stack              ucycles    kcycles    cpu  "
                 "waitqueue\n");
         printf("------ ---------- ------------------ -------- ------------------ "
-                "--- ------------------ ------------------ ---------- ---------- ---------- ---- "
+                "--- ------------------ ------------------ ---------- ---------- ---- "
                 "------------------\n");
 #endif