Changeset 1ba37fa in mainline for kernel/generic/src/proc

Timestamp:

2010-04-06T11:53:32Z (15 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

516adce

Parents:

f0dcdc5

Message:

Removed useless cycles sum, using ucycles + kcycles instead.

Location:

kernel/generic/src/proc

Files:

• scheduler.c (modified) (1 diff)
• task.c (modified) (5 diffs)
• thread.c (modified) (5 diffs)

kernel/generic/src/proc/scheduler.c

@@ -316 +316 @@
                 spinlock_lock(&THREAD->lock);
                 
-                /* Update thread accounting */
-                THREAD->cycles += get_cycle() - THREAD->last_cycle;
+                /* Update thread kernel accounting */
                 THREAD->kcycles += get_cycle() - THREAD->last_cycle;
                 

kernel/generic/src/proc/task.c

@@ -184 +184 @@
         ta->context = CONTEXT;
         ta->capabilities = 0;
-        ta->cycles = 0;
         ta->ucycles = 0;
         ta->kcycles = 0;
@@ -322 +321 @@
  * @param kcycles       Out pointer to sum of all kernel cycles.
  */
-uint64_t task_get_accounting(task_t *t, uint64_t *ucycles, uint64_t *kcycles)
+void 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;
@@ -343 +341 @@
                         uret += thr->ucycles;
                         kret += thr->kcycles;
-                        ret += thr->cycles;
                 }
                 spinlock_unlock(&thr->lock);
@@ -350 +347 @@
         *ucycles = uret;
         *kcycles = kret;
-
-        return ret;
 }
 
@@ -417 +412 @@
         spinlock_lock(&t->lock);
                         
-        uint64_t cycles;
         uint64_t ucycles;
         uint64_t kcycles;
-        char suffix, usuffix, ksuffix;
-        cycles = task_get_accounting(t, &ucycles, &kcycles);
-        order(cycles, &cycles, &suffix);
+        char usuffix, ksuffix;
+        task_get_accounting(t, &ucycles, &kcycles);
         order(ucycles, &ucycles, &usuffix);
         order(kcycles, &kcycles, &ksuffix);

kernel/generic/src/proc/thread.c

@@ -133 +133 @@
         if (!THREAD->uncounted) {
                 thread_update_accounting(true);
-                uint64_t cycles = THREAD->cycles;
-                THREAD->cycles = 0;
                 uint64_t ucycles = THREAD->ucycles;
                 THREAD->ucycles = 0;
@@ -143 +141 @@
                 
                 spinlock_lock(&TASK->lock);
-                TASK->cycles += cycles;
                 TASK->ucycles += ucycles;
                 TASK->kcycles += kcycles;
@@ -330 +327 @@
         t->thread_arg = arg;
         t->ticks = -1;
-        t->cycles = 0;
         t->ucycles = 0;
         t->kcycles = 0;
@@ -623 +619 @@
         thread_t *t = avltree_get_instance(node, thread_t, threads_tree_node);
         
-        uint64_t cycles, ucycles, kcycles;
-        char suffix, usuffix, ksuffix;
-        order(t->cycles, &cycles, &suffix);
+        uint64_t ucycles, kcycles;
+        char usuffix, ksuffix;
         order(t->ucycles, &ucycles, &usuffix);
         order(t->kcycles, &kcycles, &ksuffix);
@@ -724 +719 @@
 {
         uint64_t time = get_cycle();
-        THREAD->cycles += time - THREAD->last_cycle;
         if (user) {
                 THREAD->ucycles += time - THREAD->last_cycle;