From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758576AbbEFDWr (ORCPT ); Tue, 5 May 2015 23:22:47 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36756 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757612AbbEFDWo (ORCPT ); Tue, 5 May 2015 23:22:44 -0400 Date: Tue, 5 May 2015 20:22:29 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: namhyung@kernel.org, jolsa@redhat.com, dsahern@gmail.com, mingo@kernel.org, acme@redhat.com, hpa@zytor.com, a.p.zijlstra@chello.nl, tglx@linutronix.de, linux-kernel@vger.kernel.org Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, hpa@zytor.com, acme@redhat.com, namhyung@kernel.org, jolsa@redhat.com, dsahern@gmail.com, mingo@kernel.org In-Reply-To: <1429838133-14001-2-git-send-email-namhyung@kernel.org> References: <1429838133-14001-2-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists browser: Simplify zooming code using pstack_peek() Git-Commit-ID: 6422184b087ff4355951d72e0bb320f52e107185 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 6422184b087ff4355951d72e0bb320f52e107185 Gitweb: http://git.kernel.org/tip/6422184b087ff4355951d72e0bb320f52e107185 Author: Namhyung Kim AuthorDate: Fri, 24 Apr 2015 10:15:33 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 5 May 2015 18:13:23 -0300 perf hists browser: Simplify zooming code using pstack_peek() Now LEFT key press action can just use do_zoom_dso/thread() code to get out of the current filter. Signed-off-by: Namhyung Kim Acked-by: Jiri Olsa Cc: David Ahern Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1429838133-14001-2-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 9bd7b38..8733d57 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -1860,19 +1860,17 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, goto out_free_stack; continue; } - top = pstack__pop(browser->pstack); + top = pstack__peek(browser->pstack); if (top == &browser->hists->dso_filter) { - perf_hpp__set_elide(HISTC_DSO, false); - browser->hists->dso_filter = NULL; - hists__filter_by_dso(browser->hists); - } - if (top == &browser->hists->thread_filter) { - perf_hpp__set_elide(HISTC_THREAD, false); - thread__zput(browser->hists->thread_filter); - hists__filter_by_thread(browser->hists); + /* + * No need to set actions->dso here since + * it's just to remove the current filter. + * Ditto for thread below. + */ + do_zoom_dso(browser, actions); } - ui_helpline__pop(); - hist_browser__reset(browser); + if (top == &browser->hists->thread_filter) + do_zoom_thread(browser, actions); continue; } case K_ESC: