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

Commit 5f201907 authored by Heiko Carstens's avatar Heiko Carstens Committed by Thomas Gleixner
Browse files

hrtimer: move timer stats helper functions to hrtimer.c 



There is no reason to make timer_stats_hrtimer_set_start_info and
friends visible to the rest of the kernel. So move all of them to
hrtimer.c.  Also make timer_stats_hrtimer_set_start_info a static
inline function so it gets inlined and we avoid another function call.
Based on a patch by Thomas Gleixner.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
LKML-Reference: <20091210095629.GC4144@osiris.boeblingen.de.ibm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 41d2e494

include/linux/hrtimer.h

+0 −43
Original line number Diff line number Diff line
@@ -440,47 +440,4 @@ extern u64 ktime_divns(const ktime_t kt, s64 div); 
/* Show pending timers: */

extern void sysrq_timer_list_show(void);



/*

 * Timer-statistics info:

 */

#ifdef CONFIG_TIMER_STATS



extern void timer_stats_update_stats(void *timer, pid_t pid, void *startf,

				     void *timerf, char *comm,

				     unsigned int timer_flag);



static inline void timer_stats_account_hrtimer(struct hrtimer *timer)

{

	if (likely(!timer_stats_active))

		return;

	timer_stats_update_stats(timer, timer->start_pid, timer->start_site,

				 timer->function, timer->start_comm, 0);

}



extern void __timer_stats_hrtimer_set_start_info(struct hrtimer *timer,

						 void *addr);



static inline void timer_stats_hrtimer_set_start_info(struct hrtimer *timer)

{

	__timer_stats_hrtimer_set_start_info(timer, __builtin_return_address(0));

}



static inline void timer_stats_hrtimer_clear_start_info(struct hrtimer *timer)

{

	timer->start_site = NULL;

}

#else

static inline void timer_stats_account_hrtimer(struct hrtimer *timer)

{

}



static inline void timer_stats_hrtimer_set_start_info(struct hrtimer *timer)

{

}



static inline void timer_stats_hrtimer_clear_start_info(struct hrtimer *timer)

{

}

#endif



#endif

kernel/hrtimer.c

+20 −4
Original line number Diff line number Diff line
@@ -756,17 +756,33 @@ static inline void hrtimer_init_timer_hres(struct hrtimer *timer) { } 


#endif /* CONFIG_HIGH_RES_TIMERS */



#ifdef CONFIG_TIMER_STATS

void __timer_stats_hrtimer_set_start_info(struct hrtimer *timer, void *addr)

static inline void timer_stats_hrtimer_set_start_info(struct hrtimer *timer)

{

#ifdef CONFIG_TIMER_STATS

	if (timer->start_site)

		return;



	timer->start_site = addr;

	timer->start_site = __builtin_return_address(0);

	memcpy(timer->start_comm, current->comm, TASK_COMM_LEN);

	timer->start_pid = current->pid;

#endif

}



static inline void timer_stats_hrtimer_clear_start_info(struct hrtimer *timer)

{

#ifdef CONFIG_TIMER_STATS

	timer->start_site = NULL;

#endif

}



static inline void timer_stats_account_hrtimer(struct hrtimer *timer)

{

#ifdef CONFIG_TIMER_STATS

	if (likely(!timer_stats_active))

		return;

	timer_stats_update_stats(timer, timer->start_pid, timer->start_site,

				 timer->function, timer->start_comm, 0);

#endif

}



/*

 * Counterpart to lock_hrtimer_base above: