aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-10-14 11:57:23 -0400
committerIngo Molnar <mingo@elte.hu>2010-10-18 13:58:58 -0400
commit82cd6def9806dcb6a325fb6abbc1d61388a15f6a (patch)
tree569ce440f8a0619adb8c3791d6b68eecdb2fd29c /include
parent8b92538d84e50062560ba33adbaed7887b6e4a42 (diff)
perf: Use jump_labels to optimize the scheduler hooks
Trades a call + conditional + ret for an unconditional jmp. Acked-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <20101014203625.501657727@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/linux/perf_event.h27
1 files changed, 25 insertions, 2 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 97965fac55fe..7f0e7f52af8b 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -487,6 +487,7 @@ struct perf_guest_info_callbacks {
487#include <linux/ftrace.h> 487#include <linux/ftrace.h>
488#include <linux/cpu.h> 488#include <linux/cpu.h>
489#include <linux/irq_work.h> 489#include <linux/irq_work.h>
490#include <linux/jump_label_ref.h>
490#include <asm/atomic.h> 491#include <asm/atomic.h>
491#include <asm/local.h> 492#include <asm/local.h>
492 493
@@ -895,8 +896,30 @@ extern void perf_pmu_unregister(struct pmu *pmu);
895 896
896extern int perf_num_counters(void); 897extern int perf_num_counters(void);
897extern const char *perf_pmu_name(void); 898extern const char *perf_pmu_name(void);
898extern void perf_event_task_sched_in(struct task_struct *task); 899extern void __perf_event_task_sched_in(struct task_struct *task);
899extern void perf_event_task_sched_out(struct task_struct *task, struct task_struct *next); 900extern void __perf_event_task_sched_out(struct task_struct *task, struct task_struct *next);
901
902extern atomic_t perf_task_events;
903
904static inline void perf_event_task_sched_in(struct task_struct *task)
905{
906 JUMP_LABEL(&perf_task_events, have_events);
907 return;
908
909have_events:
910 __perf_event_task_sched_in(task);
911}
912
913static inline
914void perf_event_task_sched_out(struct task_struct *task, struct task_struct *next)
915{
916 JUMP_LABEL(&perf_task_events, have_events);
917 return;
918
919have_events:
920 __perf_event_task_sched_out(task, next);
921}
922
900extern int perf_event_init_task(struct task_struct *child); 923extern int perf_event_init_task(struct task_struct *child);
901extern void perf_event_exit_task(struct task_struct *child); 924extern void perf_event_exit_task(struct task_struct *child);
902extern void perf_event_free_task(struct task_struct *task); 925extern void perf_event_free_task(struct task_struct *task);