[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4B155068.6040003@oracle.com>
Date: Tue, 01 Dec 2009 09:20:40 -0800
From: Randy Dunlap <randy.dunlap@...cle.com>
To: Jason Baron <jbaron@...hat.com>
CC: mingo@...e.hu, linux-kernel@...r.kernel.org, mhiramat@...hat.com,
wcohen@...hat.com, rostedt@...dmis.org, fweisbec@...il.com,
mathieu.desnoyers@...ymtl.ca
Subject: Re: [PATCH v2] tracing: add DEFINE_EVENT(), DEFINE_SINGLE_EVENT()
support to docbook
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 <jbaron@...hat.com>
> Acked-by: Steven Rostedt <rostedt@...dmis.org>
> Cc: Randy Dunlap <randy.dunlap@...cle.com>
Acked-by: Randy Dunlap <randy.dunlap@...cle.com>
Thanks.
> Cc: William Cohen <wcohen@...hat.com>
> Cc: Frederic Weisbecker <fweisbec@...il.com>
> Cc: Mathieu Desnoyers <mathieu.desnoyers@...ymtl.ca>
> Cc: Masami Hiramatsu <mhiramat@...hat.com>
> ---
> 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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists