diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-04-26 14:34:37 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-04-26 18:47:17 +0200 |
| commit | 404eb5a436c4cbdc3b76896a28a3b72b7ad9294e (patch) | |
| tree | 58fda90bb9a25d8318c1ed51b2521ee4f0366583 /tools/perf/builtin-script.c | |
| parent | perf thread: Ditch __thread__find_symbol() (diff) | |
| download | linux-404eb5a436c4cbdc3b76896a28a3b72b7ad9294e.tar.xz linux-404eb5a436c4cbdc3b76896a28a3b72b7ad9294e.zip | |
perf thread: Make thread__find_map() search all maps
We still have the split internally, but users don't see it anymore,
simplifying the growing number of cases where we end up searching
in the MAP__VARIABLE maps.
This further paves the way for ditching the split.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-86mfxrztf310konutxvhr5ua@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-script.c')
| -rw-r--r-- | tools/perf/builtin-script.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 07cb083ac89c..fa2c7a288750 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -927,8 +927,8 @@ static int ip__fprintf_sym(uint64_t addr, struct thread *thread, memset(&al, 0, sizeof(al)); - if (!thread__find_map(thread, cpumode, addr, &al)) - __thread__find_map(thread, cpumode, MAP__VARIABLE, addr, &al); + thread__find_map(thread, cpumode, addr, &al); + if ((*lastsym) && al.addr >= (*lastsym)->start && al.addr < (*lastsym)->end) return 0; |