Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cecb7fe authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf hists: Move sort__has_comm into struct perf_hpp_list 



Now we have sort dimensions private for struct hists,
we need to make dimension booleans hists specific as
well.

Moving sort__has_comm into struct perf_hpp_list.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1462276488-26683-8-git-send-email-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent fa82911a

tools/perf/ui/browsers/hists.c

+4 −2
Original line number Diff line number Diff line
@@ -2320,7 +2320,8 @@ do_zoom_thread(struct hist_browser *browser, struct popup_action *act) 
{

	struct thread *thread = act->thread;



	if ((!hists__has(browser->hists, thread) && !sort__has_comm) || thread == NULL)

	if ((!hists__has(browser->hists, thread) &&

	     !hists__has(browser->hists, comm)) || thread == NULL)

		return 0;



	if (browser->hists->thread_filter) {
@@ -2354,7 +2355,8 @@ add_thread_opt(struct hist_browser *browser, struct popup_action *act, 
{

	int ret;



	if ((!hists__has(browser->hists, thread) && !sort__has_comm) || thread == NULL)

	if ((!hists__has(browser->hists, thread) &&

	     !hists__has(browser->hists, comm)) || thread == NULL)

		return 0;



	if (hists__has(browser->hists, thread)) {

tools/perf/util/hist.h

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ struct perf_hpp_list { 
	int dso;

	int socket;

	int thread;

	int comm;

};



extern struct perf_hpp_list perf_hpp_list;

tools/perf/util/sort.c

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ const char *sort_order; 
const char	*field_order;

regex_t		ignore_callees_regex;

int		have_ignore_callees = 0;

int		sort__has_comm = 0;

enum sort_mode	sort__mode = SORT_MODE__NORMAL;



/*
@@ -2258,7 +2257,7 @@ static int sort_dimension__add(struct perf_hpp_list *list, const char *tok, 
		} else if (sd->entry == &sort_thread) {

			list->thread = 1;

		} else if (sd->entry == &sort_comm) {

			sort__has_comm = 1;

			list->comm = 1;

		}



		return __sort_dimension__add(sd, list, level);

tools/perf/util/sort.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ extern const char *parent_pattern; 
extern const char default_sort_order[];

extern regex_t ignore_callees_regex;

extern int have_ignore_callees;

extern int sort__has_comm;

extern enum sort_mode sort__mode;

extern struct sort_entry sort_comm;

extern struct sort_entry sort_dso;