diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-03-03 01:17:53 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-03-03 01:17:53 -0500 |
commit | 94ac003b665fc04f13a7ab3b2be896b9b9503451 (patch) | |
tree | 1fdaaf514ed20dfd1f3657693a55ab1547f1a656 /tools/perf/ui/browsers/hists.c | |
parent | 788b94ba6c223d4ce955218d59075cd1edb92692 (diff) | |
parent | ae536acfacb65a4a9858c32b12361e09f84f4157 (diff) |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
User visible changes:
- Warn if given uprobe event accesses memory on older kernel (Masami Hiramatsu)
- 'perf record' Documentation fixes (Namhyung Kim)
- Report unsupported events properly in 'perf stat' (Suzuki K. Poulose)
Infrastructure changes:
- Avoid FORK after COMM when synthesizing records for pre-existing threads (Arnaldo Carvalho de Melo)
- Reference count struct thread (Arnaldo Carvalho de Melo)
- Don't keep the session around in 'perf sched', thread refcounting removes that need (Arnaldo Carvalho de Melo)
- Initialize cpu set in pthread_attr_setaffinity_np() feature test (Adrian Hunter)
- Only include tsc file for x86 (David Ahern)
- Compare JOBS to 0 after grep (David Ahern)
- Improve feature detection messages (Ingo Molnar)
- Revert "perf: Remove the extra validity check on nr_pages" (Kan Liang)
- Remove bias offset to find probe point by address (Masami Hiramatsu)
- Fix build error on ARCH=i386/x86_64/sparc64 (Namhyung Kim)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/ui/browsers/hists.c')
-rw-r--r-- | tools/perf/ui/browsers/hists.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 788506eef567..ad312d91caed 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c | |||
@@ -1467,7 +1467,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, | |||
1467 | perf_hpp__set_user_width(symbol_conf.col_width_list_str); | 1467 | perf_hpp__set_user_width(symbol_conf.col_width_list_str); |
1468 | 1468 | ||
1469 | while (1) { | 1469 | while (1) { |
1470 | const struct thread *thread = NULL; | 1470 | struct thread *thread = NULL; |
1471 | const struct dso *dso = NULL; | 1471 | const struct dso *dso = NULL; |
1472 | int choice = 0, | 1472 | int choice = 0, |
1473 | annotate = -2, zoom_dso = -2, zoom_thread = -2, | 1473 | annotate = -2, zoom_dso = -2, zoom_thread = -2, |
@@ -1754,13 +1754,13 @@ zoom_thread: | |||
1754 | pstack__remove(fstack, &browser->hists->thread_filter); | 1754 | pstack__remove(fstack, &browser->hists->thread_filter); |
1755 | zoom_out_thread: | 1755 | zoom_out_thread: |
1756 | ui_helpline__pop(); | 1756 | ui_helpline__pop(); |
1757 | browser->hists->thread_filter = NULL; | 1757 | thread__zput(browser->hists->thread_filter); |
1758 | perf_hpp__set_elide(HISTC_THREAD, false); | 1758 | perf_hpp__set_elide(HISTC_THREAD, false); |
1759 | } else { | 1759 | } else { |
1760 | ui_helpline__fpush("To zoom out press <- or -> + \"Zoom out of %s(%d) thread\"", | 1760 | ui_helpline__fpush("To zoom out press <- or -> + \"Zoom out of %s(%d) thread\"", |
1761 | thread->comm_set ? thread__comm_str(thread) : "", | 1761 | thread->comm_set ? thread__comm_str(thread) : "", |
1762 | thread->tid); | 1762 | thread->tid); |
1763 | browser->hists->thread_filter = thread; | 1763 | browser->hists->thread_filter = thread__get(thread); |
1764 | perf_hpp__set_elide(HISTC_THREAD, false); | 1764 | perf_hpp__set_elide(HISTC_THREAD, false); |
1765 | pstack__push(fstack, &browser->hists->thread_filter); | 1765 | pstack__push(fstack, &browser->hists->thread_filter); |
1766 | } | 1766 | } |