Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1344592

[PATCH 1/5] perf report: Fix comparing of dynamic entries

Show all headers | View raw

When hist_entry__cmp() and hist_entry__collapse() are called, it should
check the dynamic entry is comparing matching hists only.  Otherwise it
might access different hists resulting in incorrect output.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/util/hist.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 75dc41d2dca9..cc849d326211 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -1002,6 +1002,10 @@ hist_entry__cmp(struct hist_entry *left, struct hist_entry *right)
 	int64_t cmp = 0;
 
 	hists__for_each_sort_list(hists, fmt) {
+		if (perf_hpp__is_dynamic_entry(fmt) &&
+		    !perf_hpp__defined_dynamic_entry(fmt, hists))
+			continue;
+
 		cmp = fmt->cmp(fmt, left, right);
 		if (cmp)
 			break;
@@ -1018,6 +1022,10 @@ hist_entry__collapse(struct hist_entry *left, struct hist_entry *right)
 	int64_t cmp = 0;
 
 	hists__for_each_sort_list(hists, fmt) {
+		if (perf_hpp__is_dynamic_entry(fmt) &&
+		    !perf_hpp__defined_dynamic_entry(fmt, hists))
+			continue;
+
 		cmp = fmt->collapse(fmt, left, right);
 		if (cmp)
 			break;
-- 
2.7.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/5] perf report: Fix comparing of dynamic entries Namhyung Kim <namhyung@kernel.org> - 2016-02-26 20:00 +0100
  Re: [PATCH 1/5] perf report: Fix comparing of dynamic entries Jiri Olsa <jolsa@redhat.com> - 2016-02-26 22:30 +0100
  [tip:perf/core] perf hists: Fix comparing of dynamic entries tip-bot for Namhyung Kim <tipbot@zytor.com> - 2016-02-27 10:50 +0100

csiph-web