LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@redhat.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Wang Nan <wangnan0@huawei.com>,
	jeremie.galarneau@efficios.com, alexmonthy@voxpopuli.im,
	bigeasy@linutronix.de, lizefan@huawei.com,
	linux-kernel@vger.kernel.org
Subject: [PATCHv3] tools lib traceevent: Add priv field to struct format_field
Date: Fri, 30 Jan 2015 15:46:32 +0100	[thread overview]
Message-ID: <20150130144632.GA19703@krava.brq.redhat.com> (raw)
In-Reply-To: <20150130142447.GA19178@krava.brq.redhat.com>

On Fri, Jan 30, 2015 at 03:24:47PM +0100, Jiri Olsa wrote:
> On Fri, Jan 30, 2015 at 09:17:19AM -0500, Steven Rostedt wrote:
> > On Mon, 26 Jan 2015 18:38:23 +0800
> > Wang Nan <wangnan0@huawei.com> wrote:
> > 
> > 
> > > diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
> > > index cf3a44b..5f76003 100644
> > > --- a/tools/lib/traceevent/event-parse.c
> > > +++ b/tools/lib/traceevent/event-parse.c
> > > @@ -5909,6 +5909,8 @@ static void free_format_fields(struct format_field *field)
> > >  		free(field->type);
> > >  		free(field->name);
> > >  		free(field);
> > > +		if (field->destroy_priv)
> > > +			field->destroy_priv(field);
> > 
> > I think you want to call field->destroy_priv() *before* you free field.
> 
> argh.. missed that :-\ will fix
> 

fixed version

jirka


---
From: Wang Nan <wangnan0@huawei.com>

Introduce a priv field to 'struct format_field' for futher expansion.

(In https://lkml.org/lkml/2015/1/21/383 , Jiri Olsa gives a suggestion
 about changing lib traceevent to solve a bug of perf-convert-to-ctf,
 which is related to duplicated field names. I think his suggestion
 should be something like this patch. )

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Tom Zanussi <tzanussi@gmail.com>
[ moved field release after destroy callback call ]
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/lib/traceevent/event-parse.c | 2 ++
 tools/lib/traceevent/event-parse.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index afe20ed9fac8..64d40b7e0582 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -6236,6 +6236,8 @@ static void free_format_fields(struct format_field *field)
 		next = field->next;
 		free(field->type);
 		free(field->name);
+		if (field->destroy_priv)
+			field->destroy_priv(field);
 		free(field);
 		field = next;
 	}
diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
index 7a3873ff9a4f..928d801444ab 100644
--- a/tools/lib/traceevent/event-parse.h
+++ b/tools/lib/traceevent/event-parse.h
@@ -190,6 +190,8 @@ struct format_field {
 	unsigned int		arraylen;
 	unsigned int		elementsize;
 	unsigned long		flags;
+	void			*priv;
+	void 			(*destroy_priv)(struct format_field *);
 };
 
 struct format {
-- 
1.9.3


  reply	other threads:[~2015-01-30 14:47 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-26 10:38 [PATCH v2 0/3] perf: convert to ctf: support converting syscalls:* tracepoints Wang Nan
2015-01-26 10:38 ` [PATCH v2 1/3] tools lib traceevent: add priv field to struct format_field Wang Nan
2015-01-29  9:09   ` Jiri Olsa
2015-01-30 14:17   ` Steven Rostedt
2015-01-30 14:24     ` Jiri Olsa
2015-01-30 14:46       ` Jiri Olsa [this message]
2015-01-26 10:38 ` [PATCH v2 2/3] perf: convert: fix duplicate field names and avoid reserved keywords Wang Nan
2015-01-30 15:25   ` Steven Rostedt
2015-01-30 16:00     ` Jiri Olsa
2015-01-26 10:38 ` [PATCH v2 3/3] perf: convert: fix signess of value Wang Nan
2015-01-26 15:00 ` [PATCH v2 0/3] perf: convert to ctf: support converting syscalls:* tracepoints Jiri Olsa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150130144632.GA19703@krava.brq.redhat.com \
    --to=jolsa@redhat.com \
    --cc=alexmonthy@voxpopuli.im \
    --cc=bigeasy@linutronix.de \
    --cc=jeremie.galarneau@efficios.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=rostedt@goodmis.org \
    --cc=wangnan0@huawei.com \
    --subject='Re: [PATCHv3] tools lib traceevent: Add priv field to struct format_field' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).