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

File:

• kernel/generic/src/proc/thread.c (modified) (8 diffs)

kernel/generic/src/proc/thread.c

@@ -50 +50 @@
 #include <synch/rwlock.h>
 #include <cpu.h>
-#include <str.h>
+#include <func.h>
 #include <context.h>
 #include <adt/avl.h>
@@ -84 +84 @@
         "Exiting",
         "Lingering"
-};
-
-typedef struct {
-        thread_id_t thread_id;
-        thread_t *thread;
-} thread_iterator_t;
+}; 
 
 /** Lock protecting the threads_tree AVL tree.
@@ -137 +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
@@ -332 +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] */
@@ -624 +614 @@
         thread_t *t = avltree_get_instance(node, thread_t, threads_tree_node);
         
-        uint64_t ucycles, kcycles;
-        char usuffix, ksuffix;
-        order_suffix(t->ucycles, &ucycles, &usuffix);
-        order_suffix(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
                         
@@ -674 +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
@@ -683 +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
@@ -719 +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;
 }
-
-static bool thread_search_walker(avltree_node_t *node, void *arg)
-{
-        thread_t *thread =
-            (thread_t *) avltree_get_instance(node, thread_t, threads_tree_node);
-        thread_iterator_t *iterator = (thread_iterator_t *) arg;
-        
-        if (thread->tid == iterator->thread_id) {
-                iterator->thread = thread;
-                return false;
-        }
-        
-        return true;
-}
-
-/** Find thread structure corresponding to thread ID.
- *
- * The threads_lock must be already held by the caller of this function and
- * interrupts must be disabled.
- *
- * @param id Thread ID.
- *
- * @return Thread structure address or NULL if there is no such thread ID.
- *
- */
-thread_t *thread_find_by_id(thread_id_t thread_id)
-{
-        thread_iterator_t iterator;
-        
-        iterator.thread_id = thread_id;
-        iterator.thread = NULL;
-        
-        avltree_walk(&threads_tree, thread_search_walker, (void *) &iterator);
-        
-        return iterator.thread;
-}
-
 
 /** Process syscall to create new thread.