From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754844AbbDTJq1 (ORCPT <rfc822;w@1wt.eu>);
	Mon, 20 Apr 2015 05:46:27 -0400
Received: from mx1.redhat.com ([209.132.183.28]:59585 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754714AbbDTJqX (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 20 Apr 2015 05:46:23 -0400
Date: Mon, 20 Apr 2015 11:46:07 +0200
From: Jiri Olsa <jolsa@redhat.com>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>, Ingo Molnar <mingo@kernel.org>,
        Peter Zijlstra <a.p.zijlstra@chello.nl>,
        LKML <linux-kernel@vger.kernel.org>, David Ahern <dsahern@gmail.com>
Subject: Re: [PATCH 6/7] perf hists browser: Split popup menu actions
Message-ID: <20150420094607.GD9872@krava.redhat.com>
References: <1429416255-12070-1-git-send-email-namhyung@kernel.org>
 <1429416255-12070-7-git-send-email-namhyung@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1429416255-12070-7-git-send-email-namhyung@kernel.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sun, Apr 19, 2015 at 01:04:14PM +0900, Namhyung Kim wrote:

SNIP

>  			continue;
>  		case 's':
> -			if (is_report_browser(hbt))
> -				goto do_data_switch;
> +			if (is_report_browser(hbt)) {
> +				key = do_switch_data(opts, browser, hbt,
> +						     fstack, env);
> +				if (key == K_SWITCH_INPUT_DATA)
> +					goto out_free_stack;
> +			}
>  			continue;
>  		case 'i':
>  			/* env->arch is NULL for live-mode (i.e. perf top) */
> @@ -1592,10 +1878,16 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
>  				continue;
>  			}
>  			top = pstack__pop(fstack);
> -			if (top == &browser->hists->dso_filter)
> -				goto zoom_out_dso;
> -			if (top == &browser->hists->thread_filter)
> -				goto zoom_out_thread;
> +			if (top == &browser->hists->dso_filter) {
> +				perf_hpp__set_elide(HISTC_DSO, false);
> +				browser->hists->dso_filter = NULL;
> +				ui_helpline__pop();
> +			}
> +			if (top == &browser->hists->thread_filter) {
> +				perf_hpp__set_elide(HISTC_THREAD, false);
> +				thread__zput(browser->hists->thread_filter);
> +				ui_helpline__pop();
> +			}

ui_helpline__pop could be called in heare and removed in above legs:

			ui_helpline__pop()

also the original code calls following for zoom out:

-                       hists__filter_by_dso(hists);
-                       hist_browser__reset(browser);


jirka
>  			continue;
>  		}
>  		case K_ESC:
> @@ -1620,200 +1912,69 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
>  		if (sort__mode == SORT_MODE__BRANCH) {
>  			bi = browser->he_selection->branch_info;
>  

SNIP