From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934251AbbIDX0X (ORCPT ); Fri, 4 Sep 2015 19:26:23 -0400 Received: from mail.kernel.org ([198.145.29.136]:34082 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934040AbbIDX0W (ORCPT ); Fri, 4 Sep 2015 19:26:22 -0400 Date: Fri, 4 Sep 2015 20:26:18 -0300 From: Arnaldo Carvalho de Melo To: kan.liang@intel.com Cc: jolsa@kernel.org, namhyung@kernel.org, adrian.hunter@intel.com, eranian@google.com, ak@linux.intel.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/5] perf,tools: Support new sort type --socket Message-ID: <20150904232618.GK3475@kernel.org> References: <1441377946-44429-1-git-send-email-kan.liang@intel.com> <1441377946-44429-2-git-send-email-kan.liang@intel.com> <20150904224139.GC3475@kernel.org> <20150904225255.GF3475@kernel.org> <20150904230621.GH3475@kernel.org> <20150904232547.GJ3475@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150904232547.GJ3475@kernel.org> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Fri, Sep 04, 2015 at 08:25:47PM -0300, Arnaldo Carvalho de Melo escreveu: > > One more fixed, see below, now we have another, using ESC should remove > > the last applied Zoom operation, just like for the other Zoom operations > > (DSO, thread, etc), looking at that now. > > Fixed, see below, to test, press S, then d to zoom into Socket then DSO > and then press ESC to unzoom one level (the DSO in this case) then ESC > again, to unzoom the Socket one. > > If you use the left arrow key it will be equivalent to ESC, but we'll > repurpose the left/right arrows for horizontal scrolling soon. > Ooops, here it is: diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 67d40feb1880..e4fd40f72b4a 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -1681,11 +1681,13 @@ static int do_zoom_socket(struct hist_browser *browser, struct popup_action *act) { if (browser->hists->socket_filter > -1) { + pstack__remove(browser->pstack, &browser->hists->socket_filter); browser->hists->socket_filter = -1; perf_hpp__set_elide(HISTC_SOCKET, false); } else { browser->hists->socket_filter = act->socket; perf_hpp__set_elide(HISTC_SOCKET, true); + pstack__push(browser->pstack, &browser->hists->socket_filter); } hists__filter_by_socket(browser->hists); @@ -1794,7 +1796,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, hist_browser__update_nr_entries(browser); } - browser->pstack = pstack__new(2); + browser->pstack = pstack__new(3); if (browser->pstack == NULL) goto out; @@ -1944,9 +1946,11 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, * Ditto for thread below. */ do_zoom_dso(browser, actions); - } - if (top == &browser->hists->thread_filter) + } else if (top == &browser->hists->thread_filter) { do_zoom_thread(browser, actions); + } else if (top == &browser->hists->socket_filter) { + do_zoom_socket(browser, actions); + } continue; } case 'q':