hrtimer: move timer stats helper functions to hrtimer.c
PATCH 1/1 hrtimer: move timer stats helper functions to hrtimer.c
From: Heiko Carstens <[email protected]>
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.
--- include/linux/hrtimer.h | 43 ------------------------------------------- kernel/hrtimer.c | 24 ++++++++++++++++++++---- 2 files changed, 20 insertions(+), 47 deletions(-)
include/linux/hrtimer.h +0 -43
@@ -435,47 +435,4 @@ extern u64 ktime_divns(const ktime_t kt,/* 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
@@ -747,17 +747,33 @@ static inline void hrtimer_init_timer_hr#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:
Commit-ID: 5f201907dfe4ad42c44006ddfcec00ed12e59497 Gitweb: http://git.kernel.org/tip/5f201907dfe4ad42c44006ddfcec00ed12e59497 Author: Heiko Carstens <[email protected]> AuthorDate: Thu, 10 Dec 2009 10:56:29 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 10 Dec 2009 13:08:11 +0100
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.
LKML-Reference: <[email protected]>
--- include/linux/hrtimer.h | 43 ------------------------------------------- kernel/hrtimer.c | 24 ++++++++++++++++++++---- 2 files changed, 20 insertions(+), 47 deletions(-)
include/linux/hrtimer.h +0 -43
@@ -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
@@ -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: