diff options
| author | Mike Chan <mike@android.com> | 2010-05-12 15:52:14 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-05-23 15:43:41 -0700 |
| commit | a628f1ecfc5c9cd20e0b04aeaab579c1ad0eef91 (patch) | |
| tree | 23c1c477d904e3a1ed65e9b57a238a2620ea09ec /kernel | |
| parent | 80652113791dba1b763e5ca9c7ed439f5b730087 (diff) | |
scheduler: cpuacct: Enable platform callbacks for cpuacct power tracking
Platform must register cpu power function that return power in
milliWatt seconds.
Change-Id: I1caa0335e316c352eee3b1ddf326fcd4942bcbe8
Signed-off-by: Mike Chan <mike@android.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 92f9f57df848..c5b09f71f0f0 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -9442,12 +9442,28 @@ static int cpuacct_cpufreq_show(struct cgroup *cgrp, struct cftype *cft, struct cgroup_map_cb *cb) { struct cpuacct *ca = cgroup_ca(cgrp); - if (ca->cpufreq_fn && ca->cpufreq_fn->show) - ca->cpufreq_fn->show(ca->cpuacct_data, cb); + if (ca->cpufreq_fn && ca->cpufreq_fn->cpufreq_show) + ca->cpufreq_fn->cpufreq_show(ca->cpuacct_data, cb); return 0; } +/* return total cpu power usage (milliWatt second) of a group */ +static u64 cpuacct_powerusage_read(struct cgroup *cgrp, struct cftype *cft) +{ + int i; + struct cpuacct *ca = cgroup_ca(cgrp); + u64 totalpower = 0; + + if (ca->cpufreq_fn && ca->cpufreq_fn->power_usage) + for_each_present_cpu(i) { + totalpower += ca->cpufreq_fn->power_usage( + ca->cpuacct_data); + } + + return totalpower; +} + static struct cftype files[] = { { .name = "usage", @@ -9466,6 +9482,10 @@ static struct cftype files[] = { .name = "cpufreq", .read_map = cpuacct_cpufreq_show, }, + { + .name = "power", + .read_u64 = cpuacct_powerusage_read + }, }; static int cpuacct_populate(struct cgroup_subsys *ss, struct cgroup *cgrp) |