On Fri, May 23, 2014 at 07:03:58PM +0900, Namhyung Kim wrote: > There're some duplicate code when adding hist entries. They are > different in that some have branch info or mem info but generally do > same thing. So introduce new struct hist_entry_iter and add callbacks > to customize each case in general way. > > The new perf_evsel__add_entry() function will look like: > > iter->prepare_entry(); > iter->add_single_entry(); > > while (iter->next_entry()) > iter->add_next_entry(); > > iter->finish_entry(); > > This will help further work like the cumulative callchain patchset. > > Tested-by: Arun Sharma <[email protected]> > Tested-by: Rodrigo Campos <[email protected]> > Acked-by: Jiri Olsa <[email protected]> > Cc: David Ahern <[email protected]> > Cc: Stephane Eranian <[email protected]> > Cc: Frederic Weisbecker <[email protected]> > Signed-off-by: Namhyung Kim <[email protected]> > --- > tools/perf/builtin-report.c | 194 +++---------------------- > tools/perf/tests/hists_filter.c | 18 +-- > tools/perf/tests/hists_output.c | 11 +- > tools/perf/util/hist.c | 303 > ++++++++++++++++++++++++++++++++++++++++ > tools/perf/util/hist.h | 33 +++++ > 5 files changed, 371 insertions(+), 188 deletions(-) > > diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c > index bc0eec1ce4be..d224f5961faa 100644 > --- a/tools/perf/builtin-report.c > +++ b/tools/perf/builtin-report.c > @@ -76,165 +76,6 @@ static int report__config(const char *var, const char > *value, void *cb) > return perf_default_config(var, value, cb); > } > > -static void report__inc_stats(struct report *rep, struct hist_entry *he) > -{ > - /* > - * The @he is either of a newly created one or an existing one > - * merging current sample. We only want to count a new one so > - * checking ->nr_events being 1. > - */ > - if (he->stat.nr_events == 1) > - rep->nr_entries++; > -
hm.. above is report specific counter update while below code is repeated for each iterator in finish_entry, maybe we should separated this and put below into a function called from generic part > - /* > - * Only counts number of samples at this stage as it's more > - * natural to do it here and non-sample events are also > - * counted in perf_session_deliver_event(). The dump_trace > - * requires this info is ready before going to the output tree. > - */ > - hists__inc_nr_events(he->hists, PERF_RECORD_SAMPLE); > - if (!he->filtered) > - he->hists->stats.nr_non_filtered_samples++; > -} jirka -- 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/
