summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMike Chan <mike@android.com>2010-05-12 15:52:14 -0700
committerColin Cross <ccross@android.com>2010-09-29 17:49:41 -0700
commit9237de98d15eb3144934214685b288eb3c83c9c8 (patch)
tree9a3357b27b91ef699dd5ae9e65aa9261312481a1 /kernel
parent8d8e56b794316003db0e9736f95ad7196fc81c68 (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.c24
1 files changed, 22 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index c9761c1ec4a4..5e1142e7b9a7 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -9078,12 +9078,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",
@@ -9102,6 +9118,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)