Changeset 95155b0c in mainline for kernel/generic/src/proc

Timestamp:

2006-12-19T10:12:24Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c8410ec9

Parents:

7e7c8747

Message:

benchmarking with statistics (initial)

Location:

kernel/generic/src/proc

Files:

• task.c (modified) (2 diffs)
• thread.c (modified) (1 diff)

kernel/generic/src/proc/task.c

@@ -53 +53 @@
 #include <lib/elf.h>
 #include <errno.h>
+#include <func.h>
 #include <syscall/copy.h>
 #include <console/klog.h>
@@ -392 +393 @@
                         spinlock_lock(&t->lock);
                         
-                        uint64_t cycles = task_get_accounting(t);
+                        uint64_t cycles;
                         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 = ' ';
+                        order(task_get_accounting(t), &cycles, &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));

kernel/generic/src/proc/thread.c

@@ -570 +570 @@
                         uint64_t cycles;
                         char suffix;
-                        
-                        if (t->cycles > 1000000000000000000LL) {
-                                cycles = t->cycles / 1000000000000000000LL;
-                                suffix = 'E';
-                        } else if (t->cycles > 1000000000000LL) {
-                                cycles = t->cycles / 1000000000000LL;
-                                suffix = 'T';
-                        } else if (t->cycles > 1000000LL) {
-                                cycles = t->cycles / 1000000LL;
-                                suffix = 'M';
-                        } else {
-                                cycles = t->cycles;
-                                suffix = ' ';
-                        }
+                        order(t->cycles, &cycles, &suffix);
                         
                         printf("%-6zd %-10s %#10zx %-8s %#10zx %-3ld %#10zx %#10zx %9llu%c ", t->tid, t->name, t, thread_states[t->state], t->task, t->task->context, t->thread_code, t->kstack, cycles, suffix);