p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

perf hists: Move sort__has_socket 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_socket into struct perf_hpp_list.

Signed-off-by: Jiri 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-6-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2016-05-03 13:54:46 +02:00 committed by Arnaldo Carvalho de Melo
parent 69849fc5d2
commit 35a634f76c
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/builtin-top.c
View File

@ -962,7 +962,7 @@ static int __cmd_top(struct perf_top *top)
machine__synthesize_threads(&top->session->machines.host, &opts->target, machine__synthesize_threads(&top->session->machines.host, &opts->target,
top->evlist->threads, false, opts->proc_map_timeout); top->evlist->threads, false, opts->proc_map_timeout);
if (sort__has_socket) { if (perf_hpp_list.socket) {
ret = perf_env__read_cpu_topology_map(&perf_env); ret = perf_env__read_cpu_topology_map(&perf_env);
if (ret < 0) if (ret < 0)
goto out_err_cpu_topo; goto out_err_cpu_topo;

4
tools/perf/ui/browsers/hists.c
View File

@ -2534,7 +2534,7 @@ add_exit_opt(struct hist_browser *browser __maybe_unused,
static int static int
do_zoom_socket(struct hist_browser *browser, struct popup_action *act) do_zoom_socket(struct hist_browser *browser, struct popup_action *act)
{ {
if (!sort__has_socket || act->socket < 0) if (!hists__has(browser->hists, socket) || act->socket < 0)
return 0; return 0;
if (browser->hists->socket_filter > -1) { if (browser->hists->socket_filter > -1) {
@ -2556,7 +2556,7 @@ static int
add_socket_opt(struct hist_browser *browser, struct popup_action *act, add_socket_opt(struct hist_browser *browser, struct popup_action *act,
char **optstr, int socket_id) char **optstr, int socket_id)
{ {
if (!sort__has_socket || socket_id < 0) if (!hists__has(browser->hists, socket) || socket_id < 0)
return 0; return 0;
if (asprintf(optstr, "Zoom %s Processor Socket %d", if (asprintf(optstr, "Zoom %s Processor Socket %d",

1
tools/perf/util/hist.h
View File

@ -245,6 +245,7 @@ struct perf_hpp_list {
int parent; int parent;
int sym; int sym;
int dso; int dso;
int socket;
}; };
extern struct perf_hpp_list perf_hpp_list; extern struct perf_hpp_list perf_hpp_list;

3
tools/perf/util/sort.c
View File

@ -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_socket = 0;
int sort__has_thread = 0; int sort__has_thread = 0;
int sort__has_comm = 0; int sort__has_comm = 0;
enum sort_mode sort__mode = SORT_MODE__NORMAL; enum sort_mode sort__mode = SORT_MODE__NORMAL;
@ -2256,7 +2255,7 @@ static int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
} else if (sd->entry == &sort_dso) { } else if (sd->entry == &sort_dso) {
list->dso = 1; list->dso = 1;
} else if (sd->entry == &sort_socket) { } else if (sd->entry == &sort_socket) {
sort__has_socket = 1; list->socket = 1;
} else if (sd->entry == &sort_thread) { } else if (sd->entry == &sort_thread) {
sort__has_thread = 1; sort__has_thread = 1;
} else if (sd->entry == &sort_comm) { } else if (sd->entry == &sort_comm) {

1
tools/perf/util/sort.h
View File

@ -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_socket;
extern int sort__has_thread; extern int sort__has_thread;
extern int sort__has_comm; extern int sort__has_comm;
extern enum sort_mode sort__mode; extern enum sort_mode sort__mode;