On Thu, Jun 23, 2016 at 09:16:21AM +0000, Wang Nan wrote: > If non_sample is selected, convert comm event to output CTF stream. > > setup_non_sample_events() is called if non_sample is selected. It creates > a comm_class for comm event. > > Use macros to generate and process_comm_event and add_comm_event. These > macros can be reused for other non-sample events. > > Signed-off-by: Wang Nan <wangn...@huawei.com> > Cc: Arnaldo Carvalho de Melo <a...@redhat.com> > Cc: Jiri Olsa <jo...@redhat.com> > --- > tools/perf/util/data-convert-bt.c | 108 > ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 108 insertions(+) > > diff --git a/tools/perf/util/data-convert-bt.c > b/tools/perf/util/data-convert-bt.c > index 0bc3ee2..bc6d42b 100644 > --- a/tools/perf/util/data-convert-bt.c > +++ b/tools/perf/util/data-convert-bt.c > @@ -68,6 +68,7 @@ struct ctf_writer { > }; > struct bt_ctf_field_type *array[6]; > } data; > + struct bt_ctf_event_class *comm_class; > }; > > struct convert { > @@ -761,6 +762,55 @@ static int process_sample_event(struct perf_tool *tool, > return cs ? 0 : -1; > } > > +#define __NON_SAMPLE_SET_FIELD(_name, _type, _field) \ > +do { \ > + ret = value_set_##_type(cw, event, #_field, _event->_name._field);\ > + if (ret) \ > + return -1; \ > +} while(0) > + > +#define __FUNC_PROCESS_NON_SAMPLE(_name, body) \ > +static int process_##_name##_event(struct perf_tool *tool, \ > + union perf_event *_event, \ > + struct perf_sample *sample, \ > + struct machine *machine) \ > +{ \ > + struct convert *c = container_of(tool, struct convert, tool);\ > + struct ctf_writer *cw = &c->writer; \ > + struct bt_ctf_event_class *event_class = cw->_name##_class;\ > + struct bt_ctf_event *event; \ > + struct ctf_stream *cs; \ > + int ret; \ > + \ > + event = bt_ctf_event_create(event_class); \ > + if (!event) { \ > + pr_err("Failed to create an CTF event\n"); \ > + return -1; \ > + } \ > + \ > + bt_ctf_clock_set_time(cw->clock, sample->time); \
coudl you please also add the global stats update, so we get the statistics straight at the end? /* update stats */ c->events_count++; c->events_size += _event->header.size; thanks, jirka