Re: [PATCH 7/7] perf hists/tui: Count callchain rows separately

[Namhyung Kim <namhyung@kernel.org>]

2014-04-23 (수), 16:29 +0200, Jiri Olsa:
> On Wed, Apr 23, 2014 at 04:00:08PM +0900, Namhyung Kim wrote:
> > When TUI hist browser expands/collapses callchains it accounted number
> > of callchain nodes into total entries to show.  However this code
> > ignores filtering so that it can make the cursor go to out of screen.
> 
> SNIP
> 
> hi,
> I needed following patch, otherwise following test case would segfault
> 
> - record with -g
> - report - unfold one symbol
> - search for nonsense
> 
> the reason is that after unfolding the symbol the nr_callchain_rows
> will get some number, which will cause the hist_browser__nr_entries
> function return (entries != 0) actually (entries == nr_callchain_rows)
> even if there's no entry passing the filter

Argh, right..  Thanks for spotting this.  I guess other filters (thread,
dso) have same problem.

> 
> fixing that by unfolding everything after the filter and reseting
> the nr_callchain_rows number

Hmm.. I think hists__remove_entry_filter() already folds them so how
about just setting ->nr_callchain_rows to 0 in hist_browser__reset()
instead?

Thanks,
Namhyung

> 
> feel free to merge this with your change if you agree ;-)
> 
> thanks,
> jirka
> 
> 
> ---
> diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
> index 5b81c0d..1cf5f45 100644
> --- a/tools/perf/ui/browsers/hists.c
> +++ b/tools/perf/ui/browsers/hists.c
> @@ -312,6 +312,8 @@ __hist_browser__set_folding(struct hist_browser *browser, bool unfold)
>  	struct rb_node *nd;
>  	struct hists *hists = browser->hists;
>  
> +	browser->nr_callchain_rows = 0;
> +
>  	for (nd = rb_first(&hists->entries);
>  	     (nd = hists__filter_entries(nd, hists, browser->min_pcnt)) != NULL;
>  	     nd = rb_next(nd)) {
> @@ -323,7 +325,6 @@ __hist_browser__set_folding(struct hist_browser *browser, bool unfold)
>  
>  static void hist_browser__set_folding(struct hist_browser *browser, bool unfold)
>  {
> -	browser->nr_callchain_rows = 0;
>  	__hist_browser__set_folding(browser, unfold);
>  
>  	browser->b.nr_entries = hist_browser__nr_entries(browser);
> @@ -1507,6 +1508,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
>  					delay_secs * 2) == K_ENTER) {
>  				hists->symbol_filter_str = *buf ? buf : NULL;
>  				hists__filter_by_symbol(hists);
> +				__hist_browser__set_folding(browser, false);
>  				hist_browser__reset(browser);
>  			}
>  			continue;