summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMike Chan <mike@android.com>2010-05-12 15:52:14 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:38:19 -0800
commit6c0d4dd0527f87230469a088b3b51823a96de7ce (patch)
tree809cec6ec853a4219900f36d9dc17aa4c33b64f3 /kernel
parent9075fa48d0b4453038b53a12d2a474312bf68742 (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 a01185969457..27ee31e5673e 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -9304,12 +9304,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",
@@ -9328,6 +9344,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)