Changeset 0313ff0 in mainline for kernel/generic/src/proc/thread.c

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

File:

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

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)