From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761831AbbA3Ksh (ORCPT ); Fri, 30 Jan 2015 05:48:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37264 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752697AbbA3Kse (ORCPT ); Fri, 30 Jan 2015 05:48:34 -0500 Date: Fri, 30 Jan 2015 11:47:51 +0100 From: Jiri Olsa To: Jiri Olsa Cc: linux-kernel@vger.kernel.org, Wang Nan , Arnaldo Carvalho de Melo , David Ahern , Frederic Weisbecker , Namhyung Kim , Paul Mackerras , Peter Zijlstra , Sebastian Andrzej Siewior , Tom Zanussi , Steven Rostedt Subject: Re: [PATCH 09/11] tools lib traceevent: Add priv field to struct format_field Message-ID: <20150130104751.GA2560@krava.brq.redhat.com> References: <1422614585-23411-1-git-send-email-jolsa@kernel.org> <1422614585-23411-10-git-send-email-jolsa@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1422614585-23411-10-git-send-email-jolsa@kernel.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jan 30, 2015 at 11:43:03AM +0100, Jiri Olsa wrote: > From: Wang Nan > > 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. ) oops, I forgot.. this one still needs ACK from Steven and patch 10 depends on that, but the rest is ok to go in even without this jirka > > Signed-off-by: Wang Nan > Cc: Arnaldo Carvalho de Melo > Cc: David Ahern > Cc: Frederic Weisbecker > Cc: Jiri Olsa > Cc: Namhyung Kim > Cc: Paul Mackerras > Cc: Peter Zijlstra > Cc: Sebastian Andrzej Siewior > Cc: Tom Zanussi > Signed-off-by: Jiri Olsa > --- > 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..5ed1ad1461c7 100644 > --- a/tools/lib/traceevent/event-parse.c > +++ b/tools/lib/traceevent/event-parse.c > @@ -6237,6 +6237,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); > 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 >