oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed BKL statistics

Browse Source
This commit is contained in:
Tomas Hruby 2010-10-19 17:07:11 +00:00
parent 7fddd8358d
commit 2419ab589d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/arch/i386/arch_clock.c
View File

@ -194,6 +194,7 @@ PUBLIC void cycles_accounting_init(void)
PUBLIC void context_stop(struct proc * p) PUBLIC void context_stop(struct proc * p)
{ {
unsigned cpu = cpuid;
u64_t tsc, tsc_delta; u64_t tsc, tsc_delta;
u64_t * __tsc_ctr_switch = get_cpulocal_var_ptr(tsc_ctr_switch); u64_t * __tsc_ctr_switch = get_cpulocal_var_ptr(tsc_ctr_switch);
@ -207,12 +208,15 @@ PUBLIC void context_stop(struct proc * p)
* for IDLE we must not hold the lock * for IDLE we must not hold the lock
*/ */
if (p == proc_addr(KERNEL)) { if (p == proc_addr(KERNEL)) {
u64_t tmp;
read_tsc_64(&tsc); read_tsc_64(&tsc);
p->p_cycles = add64(p->p_cycles, sub64(tsc, *__tsc_ctr_switch)); tmp = sub64(tsc, *__tsc_ctr_switch);
kernel_ticks[cpu] = add64(kernel_ticks[cpu], tmp);
p->p_cycles = add64(p->p_cycles, tmp);
BKL_UNLOCK(); BKL_UNLOCK();
} else { } else {
u64_t bkl_tsc, tmp; u64_t bkl_tsc;
unsigned cpu = cpuid;
atomic_t succ; atomic_t succ;
read_tsc_64(&bkl_tsc); read_tsc_64(&bkl_tsc);
@ -227,9 +231,7 @@ PUBLIC void context_stop(struct proc * p)
bkl_tries[cpu]++; bkl_tries[cpu]++;
bkl_succ[cpu] += !(!(succ == 0)); bkl_succ[cpu] += !(!(succ == 0));
tmp = sub64(tsc, *__tsc_ctr_switch); p->p_cycles = add64(p->p_cycles, sub64(tsc, *__tsc_ctr_switch));
kernel_ticks[cpu] = add64(kernel_ticks[cpu], tmp);
p->p_cycles = add64(p->p_cycles, tmp);
} }
#else #else
read_tsc_64(&tsc); read_tsc_64(&tsc);