Skip to content

Commit

Permalink
jump_label: Add COND_STMT(), reducer wrappery
Browse files Browse the repository at this point in the history
The use of the JUMP_LABEL() construct ends up creating endless silly
wrappers, create a higher level construct to reduce this clutter.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Jason Baron <jbaron@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Oct 18, 2010
1 parent 7e54a5a commit ebf31f5
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
10 changes: 10 additions & 0 deletions include/linux/jump_label.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,14 @@ static inline int jump_label_text_reserved(void *start, void *end)

#endif

#define COND_STMT(key, stmt) \
do { \
__label__ jl_enabled; \
JUMP_LABEL(key, jl_enabled); \
if (0) { \
jl_enabled: \
stmt; \
} \
} while (0)

#endif
12 changes: 2 additions & 10 deletions include/linux/perf_event.h
Original file line number Diff line number Diff line change
Expand Up @@ -903,21 +903,13 @@ extern atomic_t perf_task_events;

static inline void perf_event_task_sched_in(struct task_struct *task)
{
JUMP_LABEL(&perf_task_events, have_events);
return;

have_events:
__perf_event_task_sched_in(task);
COND_STMT(&perf_task_events, __perf_event_task_sched_in(task));
}

static inline
void perf_event_task_sched_out(struct task_struct *task, struct task_struct *next)
{
JUMP_LABEL(&perf_task_events, have_events);
return;

have_events:
__perf_event_task_sched_out(task, next);
COND_STMT(&perf_task_events, __perf_event_task_sched_out(task, next));
}

extern int perf_event_init_task(struct task_struct *child);
Expand Down

0 comments on commit ebf31f5

Please sign in to comment.