Skip to content

Commit

Permalink
perf symbols: Record the reason for filtering an address_location
Browse files Browse the repository at this point in the history
By turning the addr_location->filtered member from a boolean to a u8
bitmap, reusing (and extending) the hist_filter enum for that.

This patch doesn't change the logic at all, as it keeps the meaning of
al->filtered !0 to mean that the entry _was_ filtered, so no change in
how this value is interpreted needs to be done at this point.

This will be soon used in upcoming patches.

Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-89hmfgtr9t22sky1lyg7nw7l@git.kernel.org
[ yanked this out of a previous patch ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
namhyung authored and acmel committed Mar 18, 2014
1 parent 80790e0 commit b3cef7f
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 17 deletions.
2 changes: 1 addition & 1 deletion tools/perf/builtin-timechart.c
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ static const char *cat_backtrace(union perf_event *event,
continue;
}

tal.filtered = false;
tal.filtered = 0;
thread__find_addr_location(al.thread, machine, cpumode,
MAP__FUNCTION, ip, &tal);

Expand Down
20 changes: 13 additions & 7 deletions tools/perf/util/event.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <linux/types.h>
#include "event.h"
#include "debug.h"
#include "hist.h"
#include "machine.h"
#include "sort.h"
#include "string.h"
Expand Down Expand Up @@ -705,7 +706,7 @@ void thread__find_addr_map(struct thread *thread,
al->thread = thread;
al->addr = addr;
al->cpumode = cpumode;
al->filtered = false;
al->filtered = 0;

if (machine == NULL) {
al->map = NULL;
Expand All @@ -731,11 +732,11 @@ void thread__find_addr_map(struct thread *thread,
if ((cpumode == PERF_RECORD_MISC_GUEST_USER ||
cpumode == PERF_RECORD_MISC_GUEST_KERNEL) &&
!perf_guest)
al->filtered = true;
al->filtered |= (1 << HIST_FILTER__GUEST);
if ((cpumode == PERF_RECORD_MISC_USER ||
cpumode == PERF_RECORD_MISC_KERNEL) &&
!perf_host)
al->filtered = true;
al->filtered |= (1 << HIST_FILTER__HOST);

return;
}
Expand Down Expand Up @@ -792,8 +793,10 @@ int perf_event__preprocess_sample(const union perf_event *event,
if (thread == NULL)
return -1;

if (thread__is_filtered(thread))
if (thread__is_filtered(thread)) {
al->filtered |= (1 << HIST_FILTER__THREAD);
goto out_filtered;
}

dump_printf(" ... thread: %s:%d\n", thread__comm_str(thread), thread->tid);
/*
Expand Down Expand Up @@ -823,21 +826,24 @@ int perf_event__preprocess_sample(const union perf_event *event,
dso->short_name) ||
(dso->short_name != dso->long_name &&
strlist__has_entry(symbol_conf.dso_list,
dso->long_name)))))
dso->long_name))))) {
al->filtered |= (1 << HIST_FILTER__DSO);
goto out_filtered;
}

al->sym = map__find_symbol(al->map, al->addr,
machine->symbol_filter);
}

if (symbol_conf.sym_list &&
(!al->sym || !strlist__has_entry(symbol_conf.sym_list,
al->sym->name)))
al->sym->name))) {
al->filtered |= (1 << HIST_FILTER__SYMBOL);
goto out_filtered;
}

return 0;

out_filtered:
al->filtered = true;
return 0;
}
7 changes: 0 additions & 7 deletions tools/perf/util/hist.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ static bool hists__filter_entry_by_thread(struct hists *hists,
static bool hists__filter_entry_by_symbol(struct hists *hists,
struct hist_entry *he);

enum hist_filter {
HIST_FILTER__DSO,
HIST_FILTER__THREAD,
HIST_FILTER__PARENT,
HIST_FILTER__SYMBOL,
};

struct callchain_param callchain_param = {
.mode = CHAIN_GRAPH_REL,
.min_percent = 0.5,
Expand Down
9 changes: 9 additions & 0 deletions tools/perf/util/hist.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ struct hist_entry;
struct addr_location;
struct symbol;

enum hist_filter {
HIST_FILTER__DSO,
HIST_FILTER__THREAD,
HIST_FILTER__PARENT,
HIST_FILTER__SYMBOL,
HIST_FILTER__GUEST,
HIST_FILTER__HOST,
};

/*
* The kernel collects the number of events it couldn't send in a stretch and
* when possible sends this number in a PERF_RECORD_LOST event. The number of
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/machine.c
Original file line number Diff line number Diff line change
Expand Up @@ -1312,7 +1312,7 @@ static int machine__resolve_callchain_sample(struct machine *machine,
continue;
}

al.filtered = false;
al.filtered = 0;
thread__find_addr_location(thread, machine, cpumode,
MAP__FUNCTION, ip, &al);
if (al.sym != NULL) {
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/symbol.h
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ struct addr_location {
struct symbol *sym;
u64 addr;
char level;
bool filtered;
u8 filtered;
u8 cpumode;
s32 cpu;
};
Expand Down

0 comments on commit b3cef7f

Please sign in to comment.