diff options
author | Mike Chan <mike@android.com> | 2010-05-12 15:52:14 -0700 |
---|---|---|
committer | Brian Swetland <swetland@google.com> | 2011-03-29 13:57:56 -0700 |
commit | da444c3d16689d6d1d6ba4ed6d0deebe2f630be4 (patch) | |
tree | 988578b24388f0bb71ec27342eec67e07779da06 /kernel | |
parent | 8b995e8bb336cf0fc35391abbc2f89c8b6779483 (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 d120fa946b91..b294a1882ffc 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -9214,12 +9214,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", @@ -9238,6 +9254,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) |