Changeset cce6acf in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2006-12-13T12:10:23Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e9db6f9e

Parents:

7e13972

Message:

thread CPU cycles accounting

File:

• kernel/generic/src/console/cmd.c (modified) (2 diffs)

kernel/generic/src/console/cmd.c

@@ -68 +68 @@
 #ifdef CONFIG_TEST
 #include <test.h>
-#endif
-
-#ifdef CONFIG_BENCH
-#include <arch/cycle.h>
 #endif
 
@@ -866 +862 @@
 {
         printf("%s\t\t%s\n", test->name, test->desc);
-#ifdef CONFIG_BENCH
-        uint64_t t0 = get_cycle();
-#endif
+        
+        /* Update and read thread accounting
+           for benchmarking */
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&THREAD->lock);
+        thread_update_accounting();
+        uint64_t t0 = THREAD->cycles;
+        spinlock_unlock(&THREAD->lock);
+        interrupts_restore(ipl);
+        
+        /* Execute the test */
         char * ret = test->entry();
-#ifdef CONFIG_BENCH
-        uint64_t dt = get_cycle() - t0;
+        
+        /* Update and read thread accounting */
+        ipl = interrupts_disable();
+        spinlock_lock(&THREAD->lock);
+        thread_update_accounting();
+        uint64_t dt = THREAD->cycles - t0;
+        spinlock_unlock(&THREAD->lock);
+        interrupts_restore(ipl);
+        
         printf("Time: %llu cycles\n", dt);
-#endif
         
         if (ret == NULL) {