Changes in kernel/generic/src/proc/thread.c [1ba37fa:137691a] in mainline

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