[RFC patch 05/32] trace event irq remove semicolons

Mathieu Desnoyers
2011-05-02T22:04:14Z

[-- Attachment #1: trace-event-irq-remove-semicolons.patch --]
[-- Type: text/plain, Size: 2199 bytes --]

Part of the gradual TRACE_EVENT() semicolon removal. Enables creation of array
of events, thus saving space for trace event probes.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
CC: Steven Rostedt <rostedt@goodmis.org>
CC: Frederic Weisbecker <fweisbec@gmail.com>
CC: Ingo Molnar <mingo@elte.hu>
CC: Thomas Gleixner <tglx@linutronix.de>
---
include/trace/events/irq.h | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)

Index: linux-2.6-lttng/include/trace/events/irq.h
===================================================================
--- linux-2.6-lttng.orig/include/trace/events/irq.h
+++ linux-2.6-lttng/include/trace/events/irq.h
@@ -6,6 +6,9 @@

#include <linux/tracepoint.h>

+#ifndef _TRACE_IRQ_DEF_
+#define _TRACE_IRQ_DEF_
+
struct irqaction;
struct softirq_action;

@@ -23,6 +26,8 @@ struct softirq_action;
softirq_name(HRTIMER), \
softirq_name(RCU))

+#endif /* _TRACE_IRQ_DEF_ */
+
/**
* irq_handler_entry - called immediately before the irq action handler
* @irq: irq number
@@ -51,7 +56,7 @@ TRACE_EVENT(irq_handler_entry,
),

TP_printk("irq=%d name=%s", __entry->irq, __get_str(name))
-);
+)

/**
* irq_handler_exit - called immediately after the irq action handler returns
@@ -82,7 +87,7 @@ TRACE_EVENT(irq_handler_exit,

TP_printk("irq=%d ret=%s",
__entry->irq, __entry->ret ? "handled" : "unhandled")
-);
+)

DECLARE_EVENT_CLASS(softirq,

@@ -100,7 +105,7 @@ DECLARE_EVENT_CLASS(softirq,

TP_printk("vec=%u [action=%s]", __entry->vec,
show_softirq_name(__entry->vec))
-);
+)

/**
* softirq_entry - called immediately before the softirq handler
@@ -114,7 +119,7 @@ DEFINE_EVENT(softirq, softirq_entry,
TP_PROTO(unsigned int vec_nr),

TP_ARGS(vec_nr)
-);
+)

/**
* softirq_exit - called immediately after the softirq handler returns
@@ -128,7 +133,7 @@ DEFINE_EVENT(softirq, softirq_exit,
TP_PROTO(unsigned int vec_nr),

TP_ARGS(vec_nr)
-);
+)

/**
* softirq_raise - called immediately when a softirq is raised
@@ -142,7 +147,7 @@ DEFINE_EVENT(softirq, softirq_raise,
TP_PROTO(unsigned int vec_nr),

TP_ARGS(vec_nr)
-);
+)

#endif /* _TRACE_IRQ_H */