Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753933AbZLARVO (ORCPT ); Tue, 1 Dec 2009 12:21:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753707AbZLARVN (ORCPT ); Tue, 1 Dec 2009 12:21:13 -0500 Received: from acsinet12.oracle.com ([141.146.126.234]:56135 "EHLO acsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753395AbZLARVM (ORCPT ); Tue, 1 Dec 2009 12:21:12 -0500 Message-ID: <4B155068.6040003@oracle.com> Date: Tue, 01 Dec 2009 09:20:40 -0800 From: Randy Dunlap Organization: Oracle Linux Engineering User-Agent: Thunderbird 2.0.0.22 (X11/20090605) MIME-Version: 1.0 To: Jason Baron CC: mingo@elte.hu, linux-kernel@vger.kernel.org, mhiramat@redhat.com, wcohen@redhat.com, rostedt@goodmis.org, fweisbec@gmail.com, mathieu.desnoyers@polymtl.ca Subject: Re: [PATCH v2] tracing: add DEFINE_EVENT(), DEFINE_SINGLE_EVENT() support to docbook References: <200912011718.nB1HIn7t011371@int-mx04.intmail.prod.int.phx2.redhat.com> In-Reply-To: <200912011718.nB1HIn7t011371@int-mx04.intmail.prod.int.phx2.redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Source-IP: acsmt356.oracle.com [141.146.40.156] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090203.4B15506F.0023:SCFMA4539814,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2693 Lines: 78 Jason Baron wrote: > The introduction of the new 'DECLARE_EVENT_CLASS()' obviates the need for the > 'TRACE_EVENT()' macro in some cases. Thus, docbook style comments that used > to live with 'TRACE_EVENT()' are now moved to 'DEFINE_EVENT()'. Thus, we need > to make the docbook system understand the new 'DEFINE_EVENT()' macro. In > addition I've tried to futureproof the patch, by also adding support for > 'DEFINE_SINGLE_EVENT()', since there has been discussion about renaming: > TRACE_EVENT() -> DEFINE_SINGLE_EVENT(). > > Without this patch the tracepoint docbook fails to build. > > I've verified that this patch correctly builds the tracepoint docbook which > currently covers signals, and irqs. > > Changes in v2: > - properly indent perl 'if' statements > > > Signed-off-by: Jason Baron > Acked-by: Steven Rostedt > Cc: Randy Dunlap Acked-by: Randy Dunlap Thanks. > Cc: William Cohen > Cc: Frederic Weisbecker > Cc: Mathieu Desnoyers > Cc: Masami Hiramatsu > --- > scripts/kernel-doc | 15 ++++++++++++--- > 1 files changed, 12 insertions(+), 3 deletions(-) > > diff --git a/scripts/kernel-doc b/scripts/kernel-doc > index ea9f8a5..241310e 100755 > --- a/scripts/kernel-doc > +++ b/scripts/kernel-doc > @@ -1852,10 +1852,17 @@ sub tracepoint_munge($) { > my $tracepointname = 0; > my $tracepointargs = 0; > > - if($prototype =~ m/TRACE_EVENT\((.*?),/) { > + if ($prototype =~ m/TRACE_EVENT\((.*?),/) { > $tracepointname = $1; > } > - if($prototype =~ m/TP_PROTO\((.*?)\)/) { > + if ($prototype =~ m/DEFINE_SINGLE_EVENT\((.*?),/) { > + $tracepointname = $1; > + } > + if ($prototype =~ m/DEFINE_EVENT\((.*?),(.*?),/) { > + $tracepointname = $2; > + } > + $tracepointname =~ s/^\s+//; #strip leading whitespace > + if ($prototype =~ m/TP_PROTO\((.*?)\)/) { > $tracepointargs = $1; > } > if (($tracepointname eq 0) || ($tracepointargs eq 0)) { > @@ -1920,7 +1927,9 @@ sub process_state3_function($$) { > if ($prototype =~ /SYSCALL_DEFINE/) { > syscall_munge(); > } > - if ($prototype =~ /TRACE_EVENT/) { > + if ($prototype =~ /TRACE_EVENT/ || $prototype =~ /DEFINE_EVENT/ || > + $prototype =~ /DEFINE_SINGLE_EVENT/) > + { > tracepoint_munge($file); > } > dump_function($prototype, $file); -- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/