forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

perf/urgent fix:

Browse source 
User visible:
 
 - Fix 'perf report' and 'perf top' handling of the '--dsos DSO-LIST',
   '--comms COMM-LIST' and '--symbols SYM-LIST' command line options,
   that were segfaulting due to not considering those lists as filters
   in the hists browser TUI code. (Arnaldo Carvalho de Melo)
 
 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVpA8FAAoJENZQFvNTUqpA3cgP/ROZfHGrsx8VQo/r4Dd5V6+U
 NYz74+Trl9+QWT9imm+5oNOEhpmR7Q7IJse1OshO9pgXvKqrs5VnvKDaYrgnX6ub
 nX2X9V6Gf6sG0ao7h7G/y0fNOrPrURff0cKZ7jl3Sb1mFnbL46hFzrUINLODyWOo
 ysSOIcQLSn32ft9+SxnQ0MIyGmo9ZrUdmWRB6GDH2P+1QTI+/VV6/AbhFEHBoZ2q
 HRwEMFY08MdkiMpvsZDB1yXsjUkD8Q4CKd9KLex1x0xRYNnmsUR2tc/abimiZUTP
 lYTaxtYmLQaDeqWqtCz8+S1NZ9FMe8wttnw1N2SF7meJbZGGFMJkspJAQW/cfYP9
 V24mgVCioLvSdYakEPg/F7SIEGPz3yNXezt0TYEn6f2FkOLh9Yae6FJBgtCeHrwb
 1NQfnl+CH7r+U3pE5xq+JjW2unAvFRsn9OFa3uYAKV+1q+LMlg+snu6FQmH9W6Vv
 LxVthExkWYUWbyu1hHGqF8YhP3ZfLbYVfkw4+ixpwlSvK4sthhl9zCraoTOMFFio
 UYbB+Vx6benRZhAZwU1/OZaUz3OrVdskmy7KLU5wmS+i+h80qEebVbOCeoO7G960
 dcGDSDMeDgCdF4Ut1qb/iC6DYbS8zD40I3T3McQdWaEtK051YtbSZhvOMMuOawGP
 t9F9ItUETzjpaaPKEttz
 =Q1J7
 -----END PGP SIGNATURE-----

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fix from Arnaldo Carvalho de Melo:

  - Fix 'perf report' and 'perf top' handling of the '--dsos DSO-LIST',
    '--comms COMM-LIST' and '--symbols SYM-LIST' command line options,
    that were segfaulting due to not considering those lists as filters
    in the hists browser TUI code. (Arnaldo Carvalho de Melo)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2015-07-15 13:31:21 +02:00
commit 65ea03e31e
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/perf/ui/browsers/hists.c
View file

@ -48,7 +48,7 @@ static struct rb_node *hists__filter_entries(struct rb_node *nd,
static bool hist_browser__has_filter(struct hist_browser *hb)
{
return hists__has_filter(hb->hists) || hb->min_pcnt;
return hists__has_filter(hb->hists) || hb->min_pcnt || symbol_conf.has_filter;
}
static int hist_browser__get_folding(struct hist_browser *browser)

2
tools/perf/util/symbol.c
View file

@ -1911,6 +1911,8 @@ int setup_list(struct strlist **list, const char *list_str,
pr_err("problems parsing %s list\n", list_name);
return -1;
}
symbol_conf.has_filter = true;
return 0;
}

3
tools/perf/util/symbol.h
View file

@ -105,7 +105,8 @@ struct symbol_conf {
demangle_kernel,
filter_relative,
show_hist_headers,
branch_callstack;
branch_callstack,
has_filter;
const char *vmlinux_name,
*kallsyms_name,
*source_prefix,