Skip to contentSkip to conversation

jump_label: Add COND_STMT(), reducer wrappery

tip:perf/core tip-bot for Peter Zijlstra 1 participant 1 message Oct 18, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw
Commit-ID:  ebf31f502492527e2b6b5e5cf85a4ebc7fc8a52e
Gitweb:     http://git.kernel.org/tip/ebf31f502492527e2b6b5e5cf85a4ebc7fc8a52e
Author:     Peter Zijlstra <[email protected]>
AuthorDate: Sun, 17 Oct 2010 12:15:00 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 18 Oct 2010 19:59:01 +0200

jump_label: Add COND_STMT(), reducer wrappery

The use of the JUMP_LABEL() construct ends up creating endless silly wrappers, create a higher level construct to reduce this clutter.

Cc Jason Baron <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Paul Mackerras <[email protected]>

LKML-Reference: <new-submission>

---
 include/linux/jump_label.h |   10 ++++++++++
 include/linux/perf_event.h |   12 ++----------
 2 files changed, 12 insertions(+), 10 deletions(-)
include/linux/jump_label.h +10 -0
index 81be496..b67cb18 100644
@@ -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
include/linux/perf_event.h +2 -10
index 3b80cbf..057bf22 100644
@@ -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);