Messages in this thread Patch in this message | | | Date | Wed, 9 Mar 2016 11:26:03 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH 2/3] perf hists browser: Allow thread filtering for comm sort key |
| |
Em Wed, Mar 09, 2016 at 11:20:52PM +0900, Namhyung Kim escreveu: > The commit 2eafd410e669 ("perf hists browser: Only 'Zoom into thread' > only when sort order has 'pid'") disabled thread filtering in hist > browser for the default sort key. However the he->thread is still valid > even if 'pid' sort key is not given. Only thing it should not use is > the pid (or tid) of the thread. So allow to filter by thread when > 'comm' sort key is given and show pid only if 'pid' sort key is given. > > Signed-off-by: Namhyung Kim <namhyung@kernel.org> > --- > tools/perf/ui/browsers/hists.c | 39 +++++++++++++++++++++++++++++---------- > 1 file changed, 29 insertions(+), 10 deletions(-) > > diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c > index aed9c8f011f7..69b0d23ffaaa 100644 > --- a/tools/perf/ui/browsers/hists.c > +++ b/tools/perf/ui/browsers/hists.c > @@ -2136,11 +2136,17 @@ static int hists__browser_title(struct hists *hists, > if (hists->uid_filter_str) > printed += snprintf(bf + printed, size - printed, > ", UID: %s", hists->uid_filter_str); > - if (thread) > - printed += scnprintf(bf + printed, size - printed, > + if (thread) { > + if (sort__has_thread)
Please use { } for multi-line if blocks.
> + printed += scnprintf(bf + printed, size - printed, > ", Thread: %s(%d)", > (thread->comm_set ? thread__comm_str(thread) : ""), > thread->tid); > + else > + printed += scnprintf(bf + printed, size - printed, > + ", Thread: %s", > + (thread->comm_set ? thread__comm_str(thread) : "")); > + } > if (dso) > printed += scnprintf(bf + printed, size - printed, > ", DSO: %s", dso->short_name); > @@ -2321,9 +2327,14 @@ do_zoom_thread(struct hist_browser *browser, struct popup_action *act) > thread__zput(browser->hists->thread_filter); > ui_helpline__pop(); > } else { > - ui_helpline__fpush("To zoom out press ESC or ENTER + \"Zoom out of %s(%d) thread\"", > - thread->comm_set ? thread__comm_str(thread) : "", > - thread->tid); > + if (sort__has_thread) > + ui_helpline__fpush("To zoom out press ESC or ENTER + \"Zoom out of %s(%d) thread\"", > + thread->comm_set ? thread__comm_str(thread) : "", > + thread->tid); > + else > + ui_helpline__fpush("To zoom out press ESC or ENTER + \"Zoom out of %s thread\"", > + thread->comm_set ? thread__comm_str(thread) : ""); > + > browser->hists->thread_filter = thread__get(thread); > perf_hpp__set_elide(HISTC_THREAD, false); > pstack__push(browser->pstack, &browser->hists->thread_filter); > @@ -2338,13 +2349,21 @@ static int > add_thread_opt(struct hist_browser *browser, struct popup_action *act, > char **optstr, struct thread *thread) > { > - if (!sort__has_thread || thread == NULL) > + int ret; > + > + if ((!sort__has_thread && !sort__has_comm) || thread == NULL) > return 0; > > - if (asprintf(optstr, "Zoom %s %s(%d) thread", > - browser->hists->thread_filter ? "out of" : "into", > - thread->comm_set ? thread__comm_str(thread) : "", > - thread->tid) < 0) > + if (sort__has_thread)
Ditto
> + ret = asprintf(optstr, "Zoom %s %s(%d) thread", > + browser->hists->thread_filter ? "out of" : "into", > + thread->comm_set ? thread__comm_str(thread) : "", > + thread->tid); > + else
ditto
> + ret = asprintf(optstr, "Zoom %s %s thread", > + browser->hists->thread_filter ? "out of" : "into", > + thread->comm_set ? thread__comm_str(thread) : ""); > + if (ret < 0) > return 0; > > act->thread = thread; > -- > 2.7.2
| |