From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760843AbZFJRBy (ORCPT ); Wed, 10 Jun 2009 13:01:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759319AbZFJRAF (ORCPT ); Wed, 10 Jun 2009 13:00:05 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.124]:59540 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755270AbZFJQ76 (ORCPT ); Wed, 10 Jun 2009 12:59:58 -0400 Message-Id: <20090610170000.065779126@goodmis.org> References: <20090610165306.794813861@goodmis.org> User-Agent: quilt/0.46-1 Date: Wed, 10 Jun 2009 12:53:13 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Frederic Weisbecker , Mathieu Desnoyers , Lai Jiangshan , Arnaldo Carvalho de Melo , Theodore Tso , Christoph Hellwig , Peter Zijlstra , Mel Gorman , Xiao Guangrong Subject: [PATCH 07/11] tracing/events: modify irq print to new format Content-Disposition: inline; filename=0007-tracing-events-modify-irq-print-to-new-format.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steven Rostedt Use new format for better parsing of irq events. Signed-off-by: Steven Rostedt --- include/trace/events/irq.h | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h index b0c7ede..4294a6d 100644 --- a/include/trace/events/irq.h +++ b/include/trace/events/irq.h @@ -7,18 +7,19 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM irq -#define softirq_name(sirq) { sirq##_SOFTIRQ, #sirq } -#define show_softirq_name(val) \ - __print_symbolic(val, \ - softirq_name(HI), \ - softirq_name(TIMER), \ - softirq_name(NET_TX), \ - softirq_name(NET_RX), \ - softirq_name(BLOCK), \ - softirq_name(TASKLET), \ - softirq_name(SCHED), \ - softirq_name(HRTIMER), \ - softirq_name(RCU)) +#define softirq_name(sirq) sirq##_SOFTIRQ, #sirq +#define show_softirq_name_format(val) \ + "%d=%s,%d=%s,%d=%s,%d=%s,%d=%s,%d=%s,%d=%s,%d=%s,%d=%s" +#define show_softirq_name_args() \ + softirq_name(HI), \ + softirq_name(TIMER), \ + softirq_name(NET_TX), \ + softirq_name(NET_RX), \ + softirq_name(BLOCK), \ + softirq_name(TASKLET), \ + softirq_name(SCHED), \ + softirq_name(HRTIMER), \ + softirq_name(RCU) /** * irq_handler_entry - called immediately before the irq action handler @@ -47,7 +48,7 @@ TRACE_EVENT(irq_handler_entry, __assign_str(name, action->name); ), - TP_printk("irq=%d handler=%s", __entry->irq, __get_str(name)) + TP_FORMAT("irq= handler=") ); /** @@ -77,8 +78,7 @@ TRACE_EVENT(irq_handler_exit, __entry->ret = ret; ), - TP_printk("irq=%d return=%s", - __entry->irq, __entry->ret ? "handled" : "unhandled") + TP_FORMAT("irq= return=") ); /** @@ -106,8 +106,9 @@ TRACE_EVENT(softirq_entry, __entry->vec = (int)(h - vec); ), - TP_printk("softirq=%d action=%s", __entry->vec, - show_softirq_name(__entry->vec)) + TP_FORMAT("softirq= action=", + show_softirq_name_args()) ); /** @@ -135,8 +136,9 @@ TRACE_EVENT(softirq_exit, __entry->vec = (int)(h - vec); ), - TP_printk("softirq=%d action=%s", __entry->vec, - show_softirq_name(__entry->vec)) + TP_FORMAT("softirq= action=", + show_softirq_name_args()) ); #endif /* _TRACE_IRQ_H */ -- 1.6.3.1 --