UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

posix-cpu-timers: Move prof/virt_ticks into caller 

The functions have only one caller left. No point in having them.

Move the almost duplicated code into the caller and simplify it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lkml.kernel.org/r/20190821192920.729298382@linutronix.de
This commit is contained in:
Thomas Gleixner 2019-08-21 21:09:03 +02:00
parent 0476ff2c15
commit ab693c5a5e
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
kernel/time/posix-cpu-timers.c
View File

@ -130,23 +130,6 @@ static inline int task_cputime_zero(const struct task_cputime *cputime)
return 0; return 0;
} }
static inline u64 prof_ticks(struct task_struct *p)
{
u64 utime, stime;
task_cputime(p, &utime, &stime);
return utime + stime;
}
static inline u64 virt_ticks(struct task_struct *p)
{
u64 utime, stime;
task_cputime(p, &utime, &stime);
return utime;
}
static int static int
posix_cpu_clock_getres(const clockid_t which_clock, struct timespec64 *tp) posix_cpu_clock_getres(const clockid_t which_clock, struct timespec64 *tp)
{ {
@ -184,13 +167,18 @@ posix_cpu_clock_set(const clockid_t clock, const struct timespec64 *tp)
*/ */
static u64 cpu_clock_sample(const clockid_t clkid, struct task_struct *p) static u64 cpu_clock_sample(const clockid_t clkid, struct task_struct *p)
{ {
u64 utime, stime;
if (clkid == CPUCLOCK_SCHED)
return task_sched_runtime(p);
task_cputime(p, &utime, &stime);
switch (clkid) { switch (clkid) {
case CPUCLOCK_PROF: case CPUCLOCK_PROF:
return prof_ticks(p); return utime + stime;
case CPUCLOCK_VIRT: case CPUCLOCK_VIRT:
return virt_ticks(p); return utime;
case CPUCLOCK_SCHED:
return task_sched_runtime(p);
default: default:
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
} }