Changeset 0313ff0 in mainline for kernel/generic/src/proc

Timestamp:

2006-12-14T12:35:57Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

def5207

Parents:

cd896e2

Message:

accumulate task accounting, run tests as separate kernel task

Location:

kernel/generic/src/proc

Files:

• task.c (modified) (5 diffs)
• thread.c (modified) (3 diffs)

kernel/generic/src/proc/task.c

@@ -120 +120 @@
         ta->capabilities = 0;
         ta->accept_new_threads = true;
+        ta->cycles = 0;
         
         ipc_answerbox_init(&ta->answerbox);
@@ -267 +268 @@
 }
 
+/** Get accounting data of given task.
+ *
+ * Note that task_lock on @t must be already held and
+ * interrupts must be already disabled.
+ *
+ * @param t Pointer to thread.
+ *
+ */
+uint64_t task_get_accounting(task_t *t)
+{
+        /* Accumulated value of task */
+        uint64_t ret = t->cycles;
+        
+        /* Current values of threads */
+        link_t *cur;
+        for (cur = t->th_head.next; cur != &t->th_head; cur = cur->next) {
+                thread_t *thr = list_get_instance(cur, thread_t, th_link);
+                
+                spinlock_lock(&thr->lock);
+                
+                if (thr == THREAD) /* Update accounting of current thread */
+                        thread_update_accounting(); 
+                ret += thr->cycles;
+                
+                spinlock_unlock(&thr->lock);
+        }
+        
+        return ret;
+}
+
 /** Kill task.
  *
@@ -345 +376 @@
         spinlock_lock(&tasks_lock);
         
-        printf("taskid name       ctx address    as         active calls callee\n");
-        printf("------ ---------- --- ---------- ---------- ------------ ------>\n");
+        printf("taskid name       ctx address    as         cycles     threads calls  callee\n");
+        printf("------ ---------- --- ---------- ---------- ---------- ------- ------ ------>\n");
 
         for (cur = tasks_btree.leaf_head.next; cur != &tasks_btree.leaf_head; cur = cur->next) {
@@ -360 +391 @@
                 
                         spinlock_lock(&t->lock);
-                        printf("%-6lld %-10s %-3ld %#10zx %#10zx %12zd", t->taskid, t->name, t->context, t, t->as, atomic_get(&t->active_calls));
+                        
+                        uint64_t cycles = task_get_accounting(t);
+                        char suffix;
+                        
+                        if (cycles > 1000000000000000000LL) {
+                                cycles = cycles / 1000000000000000000LL;
+                                suffix = 'E';
+                        } else if (cycles > 1000000000000LL) {
+                                cycles = cycles / 1000000000000LL;
+                                suffix = 'T';
+                        } else if (cycles > 1000000LL) {
+                                cycles = cycles / 1000000LL;
+                                suffix = 'M';
+                        } else 
+                                suffix = ' ';
+                        
+                        printf("%-6lld %-10s %-3ld %#10zx %#10zx %9llu%c %7zd %6zd", t->taskid, t->name, t->context, t, t->as, cycles, suffix, t->refcount, atomic_get(&t->active_calls));
                         for (j = 0; j < IPC_MAX_PHONES; j++) {
                                 if (t->phones[j].callee)
@@ -366 +413 @@
                         }
                         printf("\n");
+                        
                         spinlock_unlock(&t->lock);
                 }

kernel/generic/src/proc/thread.c

@@ -114 +114 @@
         THREAD->last_cycle = get_cycle();
 
-        /* this is where each thread wakes up after its creation */
+        /* This is where each thread wakes up after its creation */
         spinlock_unlock(&THREAD->lock);
         interrupts_enable();
 
         f(arg);
+        
+        /* Accumulate accounting to the task */
+        ipl_t ipl = interrupts_disable();
+        
+        spinlock_lock(&THREAD->lock);
+        thread_update_accounting();
+        uint64_t cycles = THREAD->cycles;
+        THREAD->cycles = 0;
+        spinlock_unlock(&THREAD->lock);
+        
+        spinlock_lock(&TASK->lock);
+        TASK->cycles += cycles;
+        spinlock_unlock(&TASK->lock);
+        
+        interrupts_restore(ipl);
+        
         thread_exit();
         /* not reached */
@@ -534 +550 @@
         spinlock_lock(&threads_lock);
         
-        printf("tid    name       address    state    task       ctx code       stack      cycles     cpu  kst        wq\n");
+        printf("tid    name       address    state    task       ctx code       stack      cycles     cpu  kstack     waitqueue\n");
         printf("------ ---------- ---------- -------- ---------- --- ---------- ---------- ---------- ---- ---------- ----------\n");
 
@@ -604 +620 @@
  * interrupts must be already disabled.
  *
- * @param t Pointer to thread.
- *
  */
 void thread_update_accounting(void)