[PATCH 61/64] perf hists browser: Simplify zooming code using pstack_peek()

2015-04-28 Thread Arnaldo Carvalho de Melo
From: Namhyung Kim 

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-namhy...@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 9bd7b38de64c..8733d577db78 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 == >hists->dso_filter) {
-   perf_hpp__set_elide(HISTC_DSO, false);
-   browser->hists->dso_filter = NULL;
-   hists__filter_by_dso(browser->hists);
-   }
-   if (top == >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 == >hists->thread_filter)
+   do_zoom_thread(browser, actions);
continue;
}
case K_ESC:
-- 
1.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 61/64] perf hists browser: Simplify zooming code using pstack_peek()

2015-04-28 Thread Arnaldo Carvalho de Melo
From: Namhyung Kim namhy...@kernel.org

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 namhy...@kernel.org
Acked-by: Jiri Olsa jo...@redhat.com
Cc: David Ahern dsah...@gmail.com
Cc: Peter Zijlstra a.p.zijls...@chello.nl
Link: 
http://lkml.kernel.org/r/1429838133-14001-2-git-send-email-namhy...@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo a...@redhat.com
---
 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 9bd7b38de64c..8733d577db78 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:
-- 
1.9.3

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/