On Fri, Jan 30, 2015 at 11:43:03AM +0100, Jiri Olsa wrote: > From: Wang Nan <[email protected]> > > 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 <[email protected]> > Cc: Arnaldo Carvalho de Melo <[email protected]> > Cc: David Ahern <[email protected]> > Cc: Frederic Weisbecker <[email protected]> > Cc: Jiri Olsa <[email protected]> > Cc: Namhyung Kim <[email protected]> > Cc: Paul Mackerras <[email protected]> > Cc: Peter Zijlstra <[email protected]> > Cc: Sebastian Andrzej Siewior <[email protected]> > Cc: Tom Zanussi <[email protected]> > Signed-off-by: Jiri Olsa <[email protected]> > --- > 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 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
