Skip to contentSkip to conversation

Use portable cputime API in __delayacct_add_tsk()

PATCH New Balbir Singh 1 participant 1 message May 10, 2006 Per-task delay accounting

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Use portable cputime API in __delayacct_add_tsk()

Hi, Andrew,

While testing on ppc64, I found that taskstats could return incorrect data. The same code worked fine on x86.

Thanks,
Balbir Singh,
Linux Technology Center,
IBM Software Labs

Description of the patch
------------------------

tsk->utime and tsk->stime are of type cputime_t. Explicitly converting from cputime to nanoseconds does not work on all platforms. Use the cputime API for conversion. This makes the code more portable and returns correct data on ppc64.

This patch has been tested on x86 and ppc64.

---

 kernel/delayacct.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)
kernel/delayacct.c renamed from kernel/delayacct.c~taskstats-use-cputime-api-for-cpu_run_real_time +2 -1
diff -puN kernel/delayacct.c~taskstats-use-cputime-api-for-cpu_run_real_time kernel/delayacct.c
@@ -112,7 +112,8 @@ int __delayacct_add_tsk(struct taskstats
 	unsigned long t1,t2,t3;
 
 	tmp = (s64)d->cpu_run_real_total;
-	tmp += (u64)(tsk->utime + tsk->stime) * TICK_NSEC;
+	cputime_to_timespec(tsk->utime + tsk->stime, &ts);
+	tmp += timespec_to_ns(&ts);
 	d->cpu_run_real_total = (tmp < (s64)d->cpu_run_real_total) ? 0 : tmp;
 
 	/*

_