Skip to contentSkip to conversation

perf report: Merge al->filtered with hist_entry-> filtered

tip:perf/core tip-bot for Namhyung Kim 1 participant 1 message Mar 19, 2014 perf events

lore
Share & tools
lore

tip-bot for Namhyung Kim

author merge bot
#0 lore raw
Commit-ID:  2c86c7ca760634f09dcbd76069e5102b4de6f8f1
Gitweb:     http://git.kernel.org/tip/2c86c7ca760634f09dcbd76069e5102b4de6f8f1
Author:     Namhyung Kim <[email protected]>
AuthorDate: Mon, 17 Mar 2014 18:18:54 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 18 Mar 2014 18:16:59 -0300

perf report: Merge al->filtered with hist_entry->filtered

I.e. don't drop al->filtered entries, create the hist_entries and use its ->filtered bitmap, that is kept with the same semantics for its bitmap, leaving the filtering to be done at the hist_entry level, i.e. in the UIs.

This will allow zooming in/out the filters.

Cc Andi Kleen <[email protected]>
Cc David Ahern <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
[ yanked this out of a previous patch ]
---
 tools/perf/builtin-report.c | 2 +-
 tools/perf/util/hist.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
tools/perf/builtin-report.c +1 -1
index c47bf58..a74059f 100644
@@ -231,7 +231,7 @@ static int process_sample_event(struct perf_tool *tool,
 		return -1;
 	}
 
-	if (al.filtered || (rep->hide_unresolved && al.sym == NULL))
+	if (rep->hide_unresolved && al.sym == NULL)
 		return 0;
 
 	if (rep->cpu_list && !test_bit(sample->cpu, rep->cpu_bitmap))
tools/perf/util/hist.c +1 -1
index 9507f33..f38590d 100644
@@ -422,7 +422,7 @@ struct hist_entry *__hists__add_entry(struct hists *hists,
 			.weight = weight,
 		},
 		.parent = sym_parent,
-		.filtered = symbol__parent_filter(sym_parent),
+		.filtered = symbol__parent_filter(sym_parent) | al->filtered,
 		.hists	= hists,
 		.branch_info = bi,
 		.mem_info = mi,