Changeset 88dea9d in mainline for kernel/generic/src/proc/thread.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/thread.c (modified) (6 diffs)

kernel/generic/src/proc/thread.c

@@ -132 +132 @@
         spinlock_lock(&THREAD->lock);
         if (!THREAD->uncounted) {
-                thread_update_accounting();
-                uint64_t cycles = THREAD->cycles;
-                THREAD->cycles = 0;
+                thread_update_accounting(true);
+                uint64_t ucycles = THREAD->ucycles;
+                THREAD->ucycles = 0;
+                uint64_t kcycles = THREAD->kcycles;
+                THREAD->kcycles = 0;
+
                 spinlock_unlock(&THREAD->lock);
                 
                 spinlock_lock(&TASK->lock);
-                TASK->cycles += cycles;
+                TASK->ucycles += ucycles;
+                TASK->kcycles += kcycles;
                 spinlock_unlock(&TASK->lock);
         } else
@@ -323 +327 @@
         t->thread_arg = arg;
         t->ticks = -1;
-        t->cycles = 0;
+        t->ucycles = 0;
+        t->kcycles = 0;
         t->uncounted = uncounted;
         t->priority = -1;               /* start in rq[0] */
@@ -614 +619 @@
         thread_t *t = avltree_get_instance(node, thread_t, threads_tree_node);
         
-        uint64_t cycles;
-        char suffix;
-        order(t->cycles, &cycles, &suffix);
+        uint64_t ucycles, kcycles;
+        char usuffix, ksuffix;
+        order(t->ucycles, &ucycles, &usuffix);
+        order(t->kcycles, &kcycles, &ksuffix);
 
 #ifdef __32_BITS__
-        printf("%-6" PRIu64" %-10s %10p %-8s %10p %-3" PRIu32 " %10p %10p %9" PRIu64 "%c ",
-            t->tid, t->name, t, thread_states[t->state], t->task,
-        t->task->context, t->thread_code, t->kstack, cycles, suffix);
+        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 ",
-            t->tid, t->name, t, thread_states[t->state], t->task,
-        t->task->context, t->thread_code, t->kstack, cycles, suffix);
+        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
                         
@@ -661 +669 @@
 #ifdef __32_BITS__      
         printf("tid    name       address    state    task       "
-                "ctx code       stack      cycles     cpu  "
+                "ctx code       stack      ucycles    kcycles    cpu  "
                 "waitqueue\n");
         printf("------ ---------- ---------- -------- ---------- "
-                "--- ---------- ---------- ---------- ---- "
+                "--- ---------- ---------- ---------- ---------- ---- "
                 "----------\n");
 #endif
@@ -670 +678 @@
 #ifdef __64_BITS__
         printf("tid    name       address            state    task               "
-                "ctx code               stack              cycles     cpu  "
+                "ctx code               stack              ucycles    kcycles    cpu  "
                 "waitqueue\n");
         printf("------ ---------- ------------------ -------- ------------------ "
-                "--- ------------------ ------------------ ---------- ---- "
+                "--- ------------------ ------------------ ---------- ---------- ---- "
                 "------------------\n");
 #endif
@@ -706 +714 @@
  * interrupts must be already disabled.
  *
- */
-void thread_update_accounting(void)
+ * @param user  True to update user accounting, false for kernel.
+ */
+void thread_update_accounting(bool user)
 {
         uint64_t time = get_cycle();
-        THREAD->cycles += time - THREAD->last_cycle;
+        if (user) {
+                THREAD->ucycles += time - THREAD->last_cycle;
+        } else {
+                THREAD->kcycles += time - THREAD->last_cycle;
+        }
         THREAD->last_cycle = time;
 }