From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Namhyung Kim <namhyung.kim@lge.com>, Jiri Olsa <jolsa@redhat.com>,
Stephane Eranian <eranian@google.com>
Subject: [PATCH 1/3] perf hists: Exchange order of comparing items when collapsing hists
Date: Tue, 4 Dec 2012 13:44:23 +0900 [thread overview]
Message-ID: <1354596265-9901-2-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1354596265-9901-1-git-send-email-namhyung@kernel.org>
From: Namhyung Kim <namhyung.kim@lge.com>
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 <jolsa@redhat.com>
Cc: Stephane Eranian <eranian@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
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);
--
1.7.11.7
next prev parent reply other threads:[~2012-12-04 4:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-04 4:44 [PATCH 0/3] perf hists: Changes on hists__{link,match} Namhyung Kim
2012-12-04 4:44 ` Namhyung Kim [this message]
2012-12-04 13:44 ` [PATCH 1/3] perf hists: Exchange order of comparing items when collapsing hists Arnaldo Carvalho de Melo
2012-12-04 14:57 ` Namhyung Kim
2012-12-04 4:44 ` [PATCH 2/3] perf hists: Link hist entries before inserting to an output tree Namhyung Kim
2012-12-04 4:44 ` [PATCH 3/3] perf diff: Use internal rb tree for compute resort Namhyung Kim
2012-12-04 13:45 ` Arnaldo Carvalho de Melo
2012-12-04 15:03 ` Namhyung Kim
2012-12-04 13:54 ` [PATCH 0/3] perf hists: Changes on hists__{link,match} Jiri Olsa
-- strict thread matches above, loose matches on Subject: below --
2012-12-05 6:56 [PATCH v2 0/3] perf hists: Changes on hists__{match,link} Namhyung Kim
2012-12-05 6:56 ` [PATCH 1/3] perf hists: Exchange order of comparing items when collapsing hists Namhyung Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1354596265-9901-2-git-send-email-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=eranian@google.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.