Em Tue, Dec 04, 2012 at 01:44:23PM +0900, Namhyung Kim escreveu: > From: Namhyung Kim <[email protected]> > > When comparing entries for collapsing put the given entry first, and > then the iterated entry. This is not the case of hist_entry__cmp() > when called if given sort keys don't require collapsing. So change > the order for the sake of consistency. It will be required for > matching and/or linking multiple hist entries. > > Cc: Jiri Olsa <[email protected]> > Cc: Stephane Eranian <[email protected]> > Signed-off-by: Namhyung Kim <[email protected]> > --- > tools/perf/util/hist.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c > index 82df1b26f0d4..161c35e7ed0e 100644 > --- a/tools/perf/util/hist.c > +++ b/tools/perf/util/hist.c > @@ -433,7 +433,7 @@ static bool hists__collapse_insert_entry(struct hists > *hists __maybe_unused, > parent = *p; > iter = rb_entry(parent, struct hist_entry, rb_node_in); > > - cmp = hist_entry__collapse(iter, he); > + cmp = hist_entry__collapse(he, iter); > > if (!cmp) { > he_stat__add_stat(&iter->stat, &he->stat);
What about this he_stat__add_stat call? Now the hist_entry__collapse receives (he, iter) while this right next function call receives (iter, he). - Arnaldo > -- > 1.7.11.7 -- 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/
