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

Commit 69849fc5 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf hists: Move sort__has_dso 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_dso 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-5-git-send-email-jolsa@kernel.org


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

tools/perf/ui/browsers/hists.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -2380,7 +2380,7 @@ do_zoom_dso(struct hist_browser *browser, struct popup_action *act) 
{

{

	struct map *map = act->ms.map;

	struct map *map = act->ms.map;





	if (!sort__has_dso || map == NULL)

	if (!hists__has(browser->hists, dso) || map == NULL)

		return 0;

		return 0;





	if (browser->hists->dso_filter) {

	if (browser->hists->dso_filter) {
@@ -2407,7 +2407,7 @@ static int 
add_dso_opt(struct hist_browser *browser, struct popup_action *act,

add_dso_opt(struct hist_browser *browser, struct popup_action *act,

	    char **optstr, struct map *map)

	    char **optstr, struct map *map)

{

{

	if (!sort__has_dso || map == NULL)

	if (!hists__has(browser->hists, dso) || map == NULL)

		return 0;

		return 0;





	if (asprintf(optstr, "Zoom %s %s DSO",

	if (asprintf(optstr, "Zoom %s %s DSO",
@@ -2429,10 +2429,10 @@ do_browse_map(struct hist_browser *browser __maybe_unused, 
}

}





static int

static int

add_map_opt(struct hist_browser *browser __maybe_unused,

add_map_opt(struct hist_browser *browser,

	    struct popup_action *act, char **optstr, struct map *map)

	    struct popup_action *act, char **optstr, struct map *map)

{

{

	if (!sort__has_dso || map == NULL)

	if (!hists__has(browser->hists, dso) || map == NULL)

		return 0;

		return 0;





	if (asprintf(optstr, "Browse map details") < 0)

	if (asprintf(optstr, "Browse map details") < 0)

tools/perf/util/hist.h

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

	int need_collapse;

	int parent;

	int parent;

	int sym;

	int sym;

	int dso;

};

};





extern struct perf_hpp_list perf_hpp_list;

extern struct perf_hpp_list perf_hpp_list;

tools/perf/util/sort.c

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

const char	*field_order;

regex_t		ignore_callees_regex;

regex_t		ignore_callees_regex;

int		have_ignore_callees = 0;

int		have_ignore_callees = 0;

int		sort__has_dso = 0;

int		sort__has_socket = 0;

int		sort__has_socket = 0;

int		sort__has_thread = 0;

int		sort__has_thread = 0;

int		sort__has_comm = 0;

int		sort__has_comm = 0;
@@ -241,7 +240,7 @@ sort__sym_cmp(struct hist_entry *left, struct hist_entry *right) 
	 * comparing symbol address alone is not enough since it's a

	 * comparing symbol address alone is not enough since it's a

	 * relative address within a dso.

	 * relative address within a dso.

	 */

	 */

	if (!sort__has_dso) {

	if (!hists__has(left->hists, dso) || hists__has(right->hists, dso)) {

		ret = sort__dso_cmp(left, right);

		ret = sort__dso_cmp(left, right);

		if (ret != 0)

		if (ret != 0)

			return ret;

			return ret;
@@ -2255,7 +2254,7 @@ static int sort_dimension__add(struct perf_hpp_list *list, const char *tok, 
				sd->entry->se_collapse = sort__sym_sort;

				sd->entry->se_collapse = sort__sym_sort;





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

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

			sort__has_dso = 1;

			list->dso = 1;

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

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

			sort__has_socket = 1;

			sort__has_socket = 1;

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

		} else if (sd->entry == &sort_thread) {
@@ -2746,7 +2745,7 @@ void reset_output_field(void) 
	perf_hpp_list.need_collapse = 0;

	perf_hpp_list.need_collapse = 0;

	perf_hpp_list.parent = 0;

	perf_hpp_list.parent = 0;

	perf_hpp_list.sym = 0;

	perf_hpp_list.sym = 0;

	sort__has_dso = 0;

	perf_hpp_list.dso = 0;





	field_order = NULL;

	field_order = NULL;

	sort_order = NULL;

	sort_order = NULL;

tools/perf/util/sort.h

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

extern const char default_sort_order[];

extern regex_t ignore_callees_regex;

extern regex_t ignore_callees_regex;

extern int have_ignore_callees;

extern int have_ignore_callees;

extern int sort__has_dso;

extern int sort__has_socket;

extern int sort__has_socket;

extern int sort__has_thread;

extern int sort__has_thread;

extern int sort__has_comm;

extern int sort__has_comm;