All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Namhyung Kim <namhyung.kim@lge.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org,
	eranian@google.com, paulus@samba.org, hpa@zytor.com,
	mingo@kernel.org, andi@firstfloor.org, a.p.zijlstra@chello.nl,
	namhyung.kim@lge.com, namhyung@kernel.org, jolsa@redhat.com,
	tglx@linutronix.de
Subject: [tip:perf/core] perf hists: Link hist entry pairs to leader
Date: Thu, 24 Jan 2013 10:47:05 -0800	[thread overview]
Message-ID: <tip-5fa9041bbaa7a79a67d568b9c9f947db2f23d091@git.kernel.org> (raw)
In-Reply-To: <1354171126-14387-8-git-send-email-namhyung@kernel.org>

Commit-ID:  5fa9041bbaa7a79a67d568b9c9f947db2f23d091
Gitweb:     http://git.kernel.org/tip/5fa9041bbaa7a79a67d568b9c9f947db2f23d091
Author:     Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Thu, 29 Nov 2012 15:38:34 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Sun, 9 Dec 2012 08:46:06 -0300

perf hists: Link hist entry pairs to leader

Current hists__match/link() link a leader to its pair, so if multiple
pairs were linked, the leader will lose pointer to previous pairs since
it was overwritten.  Fix it by making leader the list head.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1354171126-14387-8-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/hist.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index d2bc05c..82df1b2 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -785,7 +785,7 @@ void hists__match(struct hists *leader, struct hists *other)
 		pair = hists__find_entry(other, pos);
 
 		if (pair)
-			hist_entry__add_pair(pos, pair);
+			hist_entry__add_pair(pair, pos);
 	}
 }
 
@@ -806,7 +806,7 @@ int hists__link(struct hists *leader, struct hists *other)
 			pair = hists__add_dummy_entry(leader, pos);
 			if (pair == NULL)
 				return -1;
-			hist_entry__add_pair(pair, pos);
+			hist_entry__add_pair(pos, pair);
 		}
 	}
 

  reply	other threads:[~2013-01-24 18:47 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-29  6:38 [PATCH 00/18] perf report: Add support for event group view (v6) Namhyung Kim
2012-11-29  6:38 ` Namhyung Kim
2012-11-29 12:21   ` Jiri Olsa
2012-11-29  6:38 ` [PATCH 01/18] perf evsel: Set leader evsel's ->leader to itself Namhyung Kim
2012-11-29 14:28   ` Jiri Olsa
2013-01-24 18:48   ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-11-29  6:38 ` [PATCH 02/18] perf evsel: Convert to _is_group_leader method Namhyung Kim
2012-11-29 14:28   ` Jiri Olsa
2013-01-24 18:49   ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-11-29  6:38 ` [PATCH 03/18] perf tools: Keep group information Namhyung Kim
2012-11-29 14:33   ` Jiri Olsa
2012-11-29 14:58     ` Namhyung Kim
2012-11-29 15:02       ` Jiri Olsa
2012-11-29 15:09         ` Namhyung Kim
2012-11-29 19:09           ` Arnaldo Carvalho de Melo
2012-12-03  1:12             ` Namhyung Kim
2012-11-29  6:38 ` [PATCH 04/18] perf header: Add HEADER_GROUP_DESC feature Namhyung Kim
2012-11-29 18:43   ` Arnaldo Carvalho de Melo
2012-12-03  1:16     ` Namhyung Kim
2012-11-29  6:38 ` [PATCH 05/18] perf tools: Fix typo on hist__entry_add_pair Namhyung Kim
2012-11-29 14:33   ` Jiri Olsa
2012-11-29  6:38 ` [PATCH 06/18] perf hists: Link hist entry pairs to leader Namhyung Kim
2013-01-24 18:47   ` tip-bot for Namhyung Kim [this message]
2012-11-29  6:38 ` [PATCH 07/18] perf hists: Exchange order of comparing items when collapsing hists Namhyung Kim
2012-11-29 18:52   ` Arnaldo Carvalho de Melo
2012-12-03  1:41     ` Namhyung Kim
2012-12-03 10:19       ` Jiri Olsa
2012-12-03 10:49         ` Namhyung Kim
2012-11-29  6:38 ` [PATCH 08/18] perf hists: Add hists__{match,link}_collapsed Namhyung Kim
2012-11-29  6:38 ` [PATCH 09/18] perf symbol: Introduce symbol_conf.event_group Namhyung Kim
2012-11-29  6:38 ` [PATCH 10/18] perf report: Make another loop for linking group hists Namhyung Kim
2012-11-29  6:38 ` [PATCH 11/18] perf hists: Resort hist entries using group members for output Namhyung Kim
2012-11-29  6:38 ` [PATCH 12/18] perf ui/hist: Add support for event group view Namhyung Kim
     [not found]   ` <20121130132943.GC1080@krava.brq.redhat.com>
2012-11-30 13:52     ` Arnaldo Carvalho de Melo
2012-12-03  1:51       ` Namhyung Kim
2012-12-04  9:16       ` Namhyung Kim
2012-12-04 13:50         ` Arnaldo Carvalho de Melo
2012-12-04 14:51           ` Namhyung Kim
2012-12-03  1:56     ` Namhyung Kim
2012-12-03 10:23       ` Jiri Olsa
2012-12-03 10:39         ` Namhyung Kim
2012-12-03 15:57           ` Jiri Olsa
2012-12-03 16:19             ` Namhyung Kim
2012-11-29  6:38 ` [PATCH 13/18] perf hist browser: " Namhyung Kim
2012-11-29  6:38 ` [PATCH 14/18] perf gtk/browser: " Namhyung Kim
2012-11-29  6:38 ` [PATCH 15/18] perf report: Bypass non-leader events when event group is enabled Namhyung Kim
2012-11-29  6:38 ` [PATCH 16/18] perf report: Show group description " Namhyung Kim
2012-11-29  6:38 ` [PATCH 17/18] perf report: Add --group option Namhyung Kim
2012-11-29  6:38 ` [PATCH 18/18] perf report: Add report.group config option Namhyung Kim
2012-11-29  6:44 ` [PATCH 00/18] perf report: Add support for event group view (v6) 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=tip-5fa9041bbaa7a79a67d568b9c9f947db2f23d091@git.kernel.org \
    --to=namhyung.kim@lge.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=andi@firstfloor.org \
    --cc=eranian@google.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=paulus@samba.org \
    --cc=tglx@linutronix.de \
    /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.