Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1712796 authored by Li Zefan's avatar Li Zefan Committed by Ingo Molnar
Browse files

sched/cpuacct: Clean up cpuacct.h 



Now most of the code in cpuacct.h can be moved to cpuacct.c

Signed-off-by: default avatarLi Zefan <lizefan@huawei.com>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/515536D5.2080401@huawei.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 5f40d804

kernel/sched/cpuacct.c

+43 −1
Original line number Diff line number Diff line
@@ -16,7 +16,49 @@ 
 * (balbir@in.ibm.com).

 */



struct cpuacct root_cpuacct;

/* Time spent by the tasks of the cpu accounting group executing in ... */

enum cpuacct_stat_index {

	CPUACCT_STAT_USER,	/* ... user mode */

	CPUACCT_STAT_SYSTEM,	/* ... kernel mode */



	CPUACCT_STAT_NSTATS,

};



/* track cpu usage of a group of tasks and its child groups */

struct cpuacct {

	struct cgroup_subsys_state css;

	/* cpuusage holds pointer to a u64-type object on every cpu */

	u64 __percpu *cpuusage;

	struct kernel_cpustat __percpu *cpustat;

};



/* return cpu accounting group corresponding to this container */

static inline struct cpuacct *cgroup_ca(struct cgroup *cgrp)

{

	return container_of(cgroup_subsys_state(cgrp, cpuacct_subsys_id),

			    struct cpuacct, css);

}



/* return cpu accounting group to which this task belongs */

static inline struct cpuacct *task_ca(struct task_struct *tsk)

{

	return container_of(task_subsys_state(tsk, cpuacct_subsys_id),

			    struct cpuacct, css);

}



static inline struct cpuacct *__parent_ca(struct cpuacct *ca)

{

	return cgroup_ca(ca->css.cgroup->parent);

}



static inline struct cpuacct *parent_ca(struct cpuacct *ca)

{

	if (!ca->css.cgroup->parent)

		return NULL;

	return cgroup_ca(ca->css.cgroup->parent);

}



static struct cpuacct root_cpuacct;



/* create a new cpu accounting group */

static struct cgroup_subsys_state *cpuacct_css_alloc(struct cgroup *cgrp)

kernel/sched/cpuacct.h

+0 −46
Original line number Diff line number Diff line 
/* Time spent by the tasks of the cpu accounting group executing in ... */

enum cpuacct_stat_index {

	CPUACCT_STAT_USER,	/* ... user mode */

	CPUACCT_STAT_SYSTEM,	/* ... kernel mode */



	CPUACCT_STAT_NSTATS,

};



#ifdef CONFIG_CGROUP_CPUACCT



#include <linux/cgroup.h>

/* track cpu usage of a group of tasks and its child groups */

struct cpuacct {

	struct cgroup_subsys_state css;

	/* cpuusage holds pointer to a u64-type object on every cpu */

	u64 __percpu *cpuusage;

	struct kernel_cpustat __percpu *cpustat;

};



extern struct cgroup_subsys cpuacct_subsys;

extern struct cpuacct root_cpuacct;



/* return cpu accounting group corresponding to this container */

static inline struct cpuacct *cgroup_ca(struct cgroup *cgrp)

{

	return container_of(cgroup_subsys_state(cgrp, cpuacct_subsys_id),

			    struct cpuacct, css);

}



/* return cpu accounting group to which this task belongs */

static inline struct cpuacct *task_ca(struct task_struct *tsk)

{

	return container_of(task_subsys_state(tsk, cpuacct_subsys_id),

			    struct cpuacct, css);

}



static inline struct cpuacct *__parent_ca(struct cpuacct *ca)

{

	return cgroup_ca(ca->css.cgroup->parent);

}



static inline struct cpuacct *parent_ca(struct cpuacct *ca)

{

	if (!ca->css.cgroup->parent)

		return NULL;

	return cgroup_ca(ca->css.cgroup->parent);

}



extern void cpuacct_init(void);

extern void cpuacct_charge(struct task_struct *tsk, u64 cputime);

extern void cpuacct_account_field(struct task_struct *p, int index, u64 val);