perf tools: Fix hist_entry__filter() for hierarchy (f4954cfb) · Commits · 戴 / test

When hierarchy mode is enabled each output format is in a separate hpp list. So when applying a filter it should check all formats in the list. Currently it only checks a single ->fmt field which was not set properly. Signed-off-by:

Namhyung Kim <namhyung@kernel.org> Tested-by:

Jiri Olsa <jolsa@kernel.org> Cc: Andi Kleen <andi@firstfloor.org> Cc: David Ahern <dsahern@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/r/1457531222-18130-2-git-send-email-namhyung@kernel.org Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/util/sort.c

+21 −7

Original line number	Diff line number	Diff line
		@@ -1602,16 +1602,30 @@ int hist_entry__filter(struct hist_entry he, int type, const void arg)
		{
		struct perf_hpp_fmt *fmt;
		struct hpp_sort_entry *hse;
		int ret = -1;
		int r;

		fmt = he->fmt;
		if (fmt == NULL \|\| !perf_hpp__is_sort_entry(fmt))
		return -1;
		perf_hpp_list__for_each_format(he->hpp_list, fmt) {
		if (!perf_hpp__is_sort_entry(fmt))
		continue;

		hse = container_of(fmt, struct hpp_sort_entry, hpp);
		if (hse->se->se_filter == NULL)
		return -1;
		continue;

		/*
		* hist entry is filtered if any of sort key in the hpp list
		* is applied. But it should skip non-matched filter types.
		*/
		r = hse->se->se_filter(he, type, arg);
		if (r >= 0) {
		if (ret < 0)
		ret = 0;
		ret \|= r;
		}
		}

		return hse->se->se_filter(he, type, arg);
		return ret;
		}

		static int __sort_dimension__add_hpp_sort(struct sort_dimension *sd,

Admin message