Changeset a2a00e8 in mainline for kernel/generic/src/proc/task.c

Timestamp:

2010-03-28T23:05:18Z (14 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

07640dfd

Parents:

34bba0e

Message:

Accounting separated to kernel and user time.

File:

• kernel/generic/src/proc/task.c (modified) (6 diffs)

kernel/generic/src/proc/task.c

@@ -185 +185 @@
         ta->capabilities = 0;
         ta->cycles = 0;
+        ta->ucycles = 0;
+        ta->kcycles = 0;
 
 #ifdef CONFIG_UDEBUG
@@ -317 +319 @@
  *
  * @param t             Pointer to thread.
- *
- * @return              Number of cycles used by the task and all its threads
- *                      so far.
- */
-uint64_t task_get_accounting(task_t *t)
-{
-        /* Accumulated value of task */
+ * @param ucycles       Out pointer to sum of all user cycles.
+ * @param kcycles       Out pointer to sum of all kernel cycles.
+ */
+uint64_t task_get_accounting(task_t *t, uint64_t *ucycles, uint64_t *kcycles)
+{
+        /* Accumulated values of task */
         uint64_t ret = t->cycles;
+        uint64_t uret = t->ucycles;
+        uint64_t kret = t->kcycles;
         
         /* Current values of threads */
@@ -336 +339 @@
                         if (thr == THREAD) {
                                 /* Update accounting of current thread */
-                                thread_update_accounting();
+                                thread_update_accounting(false);
                         } 
+                        uret += thr->ucycles;
+                        kret += thr->kcycles;
                         ret += thr->cycles;
                 }
@@ -343 +348 @@
         }
         
+        *ucycles = uret;
+        *kcycles = kret;
+
         return ret;
 }
@@ -410 +418 @@
                         
         uint64_t cycles;
-        char suffix;
-        order(task_get_accounting(t), &cycles, &suffix);
+        uint64_t ucycles;
+        uint64_t kcycles;
+        char suffix, usuffix, ksuffix;
+        cycles = task_get_accounting(t, &ucycles, &kcycles);
+        order(cycles, &cycles, &suffix);
+        order(ucycles, &ucycles, &usuffix);
+        order(kcycles, &kcycles, &ksuffix);
 
 #ifdef __32_BITS__      
-        printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %10p %10p %9" PRIu64
-            "%c %7ld %6ld", t->taskid, t->name, t->context, t, t->as, cycles,
-            suffix, atomic_get(&t->refcount), atomic_get(&t->active_calls));
+        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,
+                ucycles, usuffix, kcycles, ksuffix, atomic_get(&t->refcount),
+                atomic_get(&t->active_calls));
 #endif
 
 #ifdef __64_BITS__
-        printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %18p %18p %9" PRIu64
-            "%c %7ld %6ld", t->taskid, t->name, t->context, t, t->as, cycles,
-            suffix, atomic_get(&t->refcount), atomic_get(&t->active_calls));
+        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,
+                ucycles, usuffix, kcycles, ksuffix, atomic_get(&t->refcount),
+                atomic_get(&t->active_calls));
 #endif
 
@@ -445 +460 @@
 
 #ifdef __32_BITS__      
-        printf("taskid name         ctx address    as         "
-            "cycles     threads calls  callee\n");
-        printf("------ ------------ --- ---------- ---------- "
-            "---------- ------- ------ ------>\n");
+        printf("taskid name         ctx address    as        "
+            " cycles     ucycles    kcycles    threads calls  callee\n");
+        printf("------ ------------ --- ---------- ----------"
+            " ---------- ---------- ---------- ------- ------ ------>\n");
 #endif
 
 #ifdef __64_BITS__
-        printf("taskid name         ctx address            as                 "
-            "cycles     threads calls  callee\n");
-        printf("------ ------------ --- ------------------ ------------------ "
-            "---------- ------- ------ ------>\n");
+        printf("taskid name         ctx address            as                "
+            " cycles     ucycles    kcycles    threads calls  callee\n");
+        printf("------ ------------ --- ------------------ ------------------"
+            " ---------- ---------- ---------- ---------- ------- ------ ------>\n");
 #endif