aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2012-11-21 10:26:44 -0500
committerFrederic Weisbecker <fweisbec@gmail.com>2012-11-28 11:07:57 -0500
commite80d0a1ae8bb8fee0edd37427836f108b30f596b (patch)
tree437db8b1643e39d3d114a7c0e3c913455e693b70 /fs
parenta634f93335daa8f38180a0e576ccd68a73c36eaf (diff)
cputime: Rename thread_group_times to thread_group_cputime_adjusted
We have thread_group_cputime() and thread_group_times(). The naming doesn't provide enough information about the difference between these two APIs. To lower the confusion, rename thread_group_times() to thread_group_cputime_adjusted(). This name better suggests that it's a version of thread_group_cputime() that does some stabilization on the raw cputime values. ie here: scale on top of CFS runtime stats and bound lower value for monotonicity. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/array.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c
index c1c207c36cae..d3696708fc1a 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -438,7 +438,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
438 438
439 min_flt += sig->min_flt; 439 min_flt += sig->min_flt;
440 maj_flt += sig->maj_flt; 440 maj_flt += sig->maj_flt;
441 thread_group_times(task, &utime, &stime); 441 thread_group_cputime_adjusted(task, &utime, &stime);
442 gtime += sig->gtime; 442 gtime += sig->gtime;
443 } 443 }
444 444
@@ -454,7 +454,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
454 if (!whole) { 454 if (!whole) {
455 min_flt = task->min_flt; 455 min_flt = task->min_flt;
456 maj_flt = task->maj_flt; 456 maj_flt = task->maj_flt;
457 task_times(task, &utime, &stime); 457 task_cputime_adjusted(task, &utime, &stime);
458 gtime = task->gtime; 458 gtime = task->gtime;
459 } 459 }
460 460