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

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

sched: Split cpuacct code out of sched.h 



Add cpuacct.h and let sched.h include it.

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


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

kernel/sched/cpuacct.h

0 → 100644
+52 −0
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)

{

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

		return NULL;

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

}



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



#else



static inline void cpuacct_charge(struct task_struct *tsk, u64 cputime)

{

}



#endif

kernel/sched/sched.h

+1 −47
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/stop_machine.h>



#include "cpupri.h"

#include "cpuacct.h"



extern __read_mostly int scheduler_running;
@@ -950,14 +951,6 @@ static const u32 prio_to_wmult[40] = { 
 /*  15 */ 119304647, 148102320, 186737708, 238609294, 286331153,

};



/* 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,

};



#define ENQUEUE_WAKEUP		1

#define ENQUEUE_HEAD		2

#ifdef CONFIG_SMP
@@ -1054,45 +1047,6 @@ extern void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime 


extern void update_idle_cpu_load(struct rq *this_rq);



#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)

{

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

		return NULL;

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

}



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

#else

static inline void cpuacct_charge(struct task_struct *tsk, u64 cputime) {}

#endif



#ifdef CONFIG_PARAVIRT

static inline u64 steal_ticks(u64 steal)

{