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

Timestamp:

2010-04-17T16:28:49Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

30a5470

Parents:

5ba201d (diff), 95319bd (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 from measuring branch

File:

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

kernel/generic/src/proc/task.c

@@ -186 +186 @@
         ta->context = CONTEXT;
         ta->capabilities = 0;
-        ta->cycles = 0;
-        
+        ta->ucycles = 0;
+        ta->kcycles = 0;
+
+        ta->ipc_info.call_sent = 0;
+        ta->ipc_info.call_recieved = 0;
+        ta->ipc_info.answer_sent = 0;
+        ta->ipc_info.answer_recieved = 0;
+        ta->ipc_info.irq_notif_recieved = 0;
+        ta->ipc_info.forwarded = 0;
+
 #ifdef CONFIG_UDEBUG
         /* Init debugging stuff */
@@ -324 +332 @@
  * already disabled.
  *
- * @param t Pointer to task.
- *
- * @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 */
-        uint64_t ret = t->cycles;
+ * @param t       Pointer to thread.
+ * @param ucycles Out pointer to sum of all user cycles.
+ * @param kcycles Out pointer to sum of all kernel cycles.
+ *
+ */
+void task_get_accounting(task_t *t, uint64_t *ucycles, uint64_t *kcycles)
+{
+        /* Accumulated values of task */
+        uint64_t uret = t->ucycles;
+        uint64_t kret = t->kcycles;
         
         /* Current values of threads */
@@ -345 +353 @@
                         if (thr == THREAD) {
                                 /* Update accounting of current thread */
-                                thread_update_accounting();
+                                thread_update_accounting(false);
                         } 
-                        ret += thr->cycles;
+                        uret += thr->ucycles;
+                        kret += thr->kcycles;
                 }
                 spinlock_unlock(&thr->lock);
         }
         
-        return ret;
+        *ucycles = uret;
+        *kcycles = kret;
 }
 
@@ -419 +429 @@
         spinlock_lock(&t->lock);
         
-        uint64_t cycles;
-        char suffix;
-        order(task_get_accounting(t), &cycles, &suffix);
-        
-#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));
+        uint64_t ucycles;
+        uint64_t kcycles;
+        char usuffix, ksuffix;
+        task_get_accounting(t, &ucycles, &kcycles);
+        order(ucycles, &ucycles, &usuffix);
+        order(kcycles, &kcycles, &ksuffix);
+        
+#ifdef __32_BITS__      
+        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));
 #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 %7ld %6ld", t->taskid, t->name, t->context, t, t->as,
+                ucycles, usuffix, kcycles, ksuffix, atomic_get(&t->refcount),
+                atomic_get(&t->active_calls));
 #endif
         
@@ -455 +470 @@
         
 #ifdef __32_BITS__
-        printf("taskid name         ctx address    as         "
-            "cycles     threads calls  callee\n");
-        printf("------ ------------ --- ---------- ---------- "
-            "---------- ------- ------ ------>\n");
+        printf("taskid name         ctx address    as        "
+            " 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                "
+            " ucycles    kcycles    threads calls  callee\n");
+        printf("------ ------------ --- ------------------ ------------------"
+            " ---------- ---------- ---------- ------- ------ ------>\n");
 #endif