From acd18d81bf44eb27720b3e0c9ad754605fede6e0 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 20 Oct 2011 08:02:30 -0200 Subject: [PATCH] --- yaml --- r: 269123 b: refs/heads/master c: cc02c921a01794f85ad53b396133f11d4ddd17ff h: refs/heads/master i: 269121: 91cab2eb8a7dc79e627ed6be2bb2900f754e820f 269119: b1bb01111fae15b563db4fd83f8411665cf7cfc2 v: v3 --- [refs] | 2 +- trunk/tools/perf/util/sort.c | 4 +++- trunk/tools/perf/util/ui/browsers/hists.c | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 440025bfda86..3a638304510a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d197fd5d743289e90c160c8c17460b390d862b98 +refs/heads/master: cc02c921a01794f85ad53b396133f11d4ddd17ff diff --git a/trunk/tools/perf/util/sort.c b/trunk/tools/perf/util/sort.c index 1ee8f1e40f18..16da30d8d765 100644 --- a/trunk/tools/perf/util/sort.c +++ b/trunk/tools/perf/util/sort.c @@ -177,7 +177,9 @@ static int hist_entry__sym_snprintf(struct hist_entry *self, char *bf, BITS_PER_LONG / 4, self->ip, o); } - ret += repsep_snprintf(bf + ret, size - ret, "[%c] ", self->level); + if (!sort_dso.elide) + ret += repsep_snprintf(bf + ret, size - ret, "[%c] ", self->level); + if (self->ms.sym) ret += repsep_snprintf(bf + ret, size - ret, "%s", self->ms.sym->name); diff --git a/trunk/tools/perf/util/ui/browsers/hists.c b/trunk/tools/perf/util/ui/browsers/hists.c index 9e23bce98827..a06e7d936ec1 100644 --- a/trunk/tools/perf/util/ui/browsers/hists.c +++ b/trunk/tools/perf/util/ui/browsers/hists.c @@ -1007,12 +1007,14 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, zoom_out_dso: ui_helpline__pop(); browser->hists->dso_filter = NULL; + sort_dso.elide = false; } else { if (dso == NULL) continue; ui_helpline__fpush("To zoom out press <- or -> + \"Zoom out of %s DSO\"", dso->kernel ? "the Kernel" : dso->short_name); browser->hists->dso_filter = dso; + sort_dso.elide = true; pstack__push(fstack, &browser->hists->dso_filter); } hists__filter_by_dso(self); @@ -1024,11 +1026,13 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, zoom_out_thread: ui_helpline__pop(); browser->hists->thread_filter = NULL; + sort_thread.elide = false; } else { ui_helpline__fpush("To zoom out press <- or -> + \"Zoom out of %s(%d) thread\"", thread->comm_set ? thread->comm : "", thread->pid); browser->hists->thread_filter = thread; + sort_thread.elide = true; pstack__push(fstack, &browser->hists->thread_filter); } hists__filter_by_thread(self);