Skip to content

Commit 9acacc2

Browse files
zhaoleiddIngo Molnar
zhaoleidd
authored and
Ingo Molnar
committed
sched/cpuacct: Merge cpuacct_usage_index and cpuacct_stat_index enums
These two types have similar function, no need to separate them. Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/436748885270d64363c7dc67167507d486c2057a.1466415271.git.zhaolei@cn.fujitsu.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent 55e16d3 commit 9acacc2

File tree

1 file changed

+20
-27
lines changed

1 file changed

+20
-27
lines changed

‎kernel/sched/cpuacct.c

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,13 @@ enum cpuacct_stat_index {
2525
CPUACCT_STAT_NSTATS,
2626
};
2727

28-
enum cpuacct_usage_index {
29-
CPUACCT_USAGE_USER, /* ... user mode */
30-
CPUACCT_USAGE_SYSTEM, /* ... kernel mode */
31-
32-
CPUACCT_USAGE_NRUSAGE,
28+
static const char * const cpuacct_stat_desc[] = {
29+
[CPUACCT_STAT_USER] = "user",
30+
[CPUACCT_STAT_SYSTEM] = "system",
3331
};
3432

3533
struct cpuacct_usage {
36-
u64 usages[CPUACCT_USAGE_NRUSAGE];
34+
u64 usages[CPUACCT_STAT_NSTATS];
3735
};
3836

3937
/* track cpu usage of a group of tasks and its child groups */
@@ -108,16 +106,16 @@ static void cpuacct_css_free(struct cgroup_subsys_state *css)
108106
}
109107

110108
static u64 cpuacct_cpuusage_read(struct cpuacct *ca, int cpu,
111-
enum cpuacct_usage_index index)
109+
enum cpuacct_stat_index index)
112110
{
113111
struct cpuacct_usage *cpuusage = per_cpu_ptr(ca->cpuusage, cpu);
114112
u64 data;
115113

116114
/*
117-
* We allow index == CPUACCT_USAGE_NRUSAGE here to read
115+
* We allow index == CPUACCT_STAT_NSTATS here to read
118116
* the sum of suages.
119117
*/
120-
BUG_ON(index > CPUACCT_USAGE_NRUSAGE);
118+
BUG_ON(index > CPUACCT_STAT_NSTATS);
121119

122120
#ifndef CONFIG_64BIT
123121
/*
@@ -126,11 +124,11 @@ static u64 cpuacct_cpuusage_read(struct cpuacct *ca, int cpu,
126124
raw_spin_lock_irq(&cpu_rq(cpu)->lock);
127125
#endif
128126

129-
if (index == CPUACCT_USAGE_NRUSAGE) {
127+
if (index == CPUACCT_STAT_NSTATS) {
130128
int i = 0;
131129

132130
data = 0;
133-
for (i = 0; i < CPUACCT_USAGE_NRUSAGE; i++)
131+
for (i = 0; i < CPUACCT_STAT_NSTATS; i++)
134132
data += cpuusage->usages[i];
135133
} else {
136134
data = cpuusage->usages[index];
@@ -155,7 +153,7 @@ static void cpuacct_cpuusage_write(struct cpuacct *ca, int cpu, u64 val)
155153
raw_spin_lock_irq(&cpu_rq(cpu)->lock);
156154
#endif
157155

158-
for (i = 0; i < CPUACCT_USAGE_NRUSAGE; i++)
156+
for (i = 0; i < CPUACCT_STAT_NSTATS; i++)
159157
cpuusage->usages[i] = val;
160158

161159
#ifndef CONFIG_64BIT
@@ -165,7 +163,7 @@ static void cpuacct_cpuusage_write(struct cpuacct *ca, int cpu, u64 val)
165163

166164
/* return total cpu usage (in nanoseconds) of a group */
167165
static u64 __cpuusage_read(struct cgroup_subsys_state *css,
168-
enum cpuacct_usage_index index)
166+
enum cpuacct_stat_index index)
169167
{
170168
struct cpuacct *ca = css_ca(css);
171169
u64 totalcpuusage = 0;
@@ -180,18 +178,18 @@ static u64 __cpuusage_read(struct cgroup_subsys_state *css,
180178
static u64 cpuusage_user_read(struct cgroup_subsys_state *css,
181179
struct cftype *cft)
182180
{
183-
return __cpuusage_read(css, CPUACCT_USAGE_USER);
181+
return __cpuusage_read(css, CPUACCT_STAT_USER);
184182
}
185183

186184
static u64 cpuusage_sys_read(struct cgroup_subsys_state *css,
187185
struct cftype *cft)
188186
{
189-
return __cpuusage_read(css, CPUACCT_USAGE_SYSTEM);
187+
return __cpuusage_read(css, CPUACCT_STAT_SYSTEM);
190188
}
191189

192190
static u64 cpuusage_read(struct cgroup_subsys_state *css, struct cftype *cft)
193191
{
194-
return __cpuusage_read(css, CPUACCT_USAGE_NRUSAGE);
192+
return __cpuusage_read(css, CPUACCT_STAT_NSTATS);
195193
}
196194

197195
static int cpuusage_write(struct cgroup_subsys_state *css, struct cftype *cft,
@@ -213,7 +211,7 @@ static int cpuusage_write(struct cgroup_subsys_state *css, struct cftype *cft,
213211
}
214212

215213
static int __cpuacct_percpu_seq_show(struct seq_file *m,
216-
enum cpuacct_usage_index index)
214+
enum cpuacct_stat_index index)
217215
{
218216
struct cpuacct *ca = css_ca(seq_css(m));
219217
u64 percpu;
@@ -229,24 +227,19 @@ static int __cpuacct_percpu_seq_show(struct seq_file *m,
229227

230228
static int cpuacct_percpu_user_seq_show(struct seq_file *m, void *V)
231229
{
232-
return __cpuacct_percpu_seq_show(m, CPUACCT_USAGE_USER);
230+
return __cpuacct_percpu_seq_show(m, CPUACCT_STAT_USER);
233231
}
234232

235233
static int cpuacct_percpu_sys_seq_show(struct seq_file *m, void *V)
236234
{
237-
return __cpuacct_percpu_seq_show(m, CPUACCT_USAGE_SYSTEM);
235+
return __cpuacct_percpu_seq_show(m, CPUACCT_STAT_SYSTEM);
238236
}
239237

240238
static int cpuacct_percpu_seq_show(struct seq_file *m, void *V)
241239
{
242-
return __cpuacct_percpu_seq_show(m, CPUACCT_USAGE_NRUSAGE);
240+
return __cpuacct_percpu_seq_show(m, CPUACCT_STAT_NSTATS);
243241
}
244242

245-
static const char * const cpuacct_stat_desc[] = {
246-
[CPUACCT_STAT_USER] = "user",
247-
[CPUACCT_STAT_SYSTEM] = "system",
248-
};
249-
250243
static int cpuacct_stats_show(struct seq_file *sf, void *v)
251244
{
252245
struct cpuacct *ca = css_ca(seq_css(sf));
@@ -316,11 +309,11 @@ static struct cftype files[] = {
316309
void cpuacct_charge(struct task_struct *tsk, u64 cputime)
317310
{
318311
struct cpuacct *ca;
319-
int index = CPUACCT_USAGE_SYSTEM;
312+
int index = CPUACCT_STAT_SYSTEM;
320313
struct pt_regs *regs = task_pt_regs(tsk);
321314

322315
if (regs && user_mode(regs))
323-
index = CPUACCT_USAGE_USER;
316+
index = CPUACCT_STAT_USER;
324317

325318
rcu_read_lock();
326319

0 commit comments

Comments
 (0)