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

Commit 5449f13c authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf annotate: Get the cpuid from evsel->evlist->env in symbol__annotate() 

To reduce its function signature, since we get this from 'evsel' which
is already one of its arguments.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Richter <tmricht@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-070eap7t6uicg9c3w086xy2z@git.kernel.org


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

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he) 
		return err;

	}



	err = symbol__annotate(sym, map, evsel, 0, NULL, NULL);

	err = symbol__annotate(sym, map, evsel, 0, NULL);

	if (err == 0) {

out_assign:

		top->sym_filter_entry = he;

tools/perf/ui/browsers/annotate.c

+1 −3
Original line number Diff line number Diff line
@@ -1116,9 +1116,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, 
	if (perf_evsel__is_group_event(evsel))

		nr_pcnt = evsel->nr_members;



	err = symbol__annotate(sym, map, evsel,

			       sizeof(struct browser_line), &browser.arch,

			       perf_evsel__env_cpuid(evsel));

	err = symbol__annotate(sym, map, evsel, sizeof(struct browser_line), &browser.arch);

	if (err) {

		char msg[BUFSIZ];

		symbol__strerror_disassemble(sym, map, err, msg, sizeof(msg));

tools/perf/ui/gtk/annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int symbol__gtk_annotate(struct symbol *sym, struct map *map, 
	if (map->dso->annotate_warned)

		return -1;



	err = symbol__annotate(sym, map, evsel, 0, NULL, NULL);

	err = symbol__annotate(sym, map, evsel, 0, NULL);

	if (err) {

		char msg[BUFSIZ];

		symbol__strerror_disassemble(sym, map, err, msg, sizeof(msg));

tools/perf/util/annotate.c

+4 −3
Original line number Diff line number Diff line
@@ -1622,13 +1622,14 @@ void symbol__calc_percent(struct symbol *sym, struct perf_evsel *evsel) 


int symbol__annotate(struct symbol *sym, struct map *map,

		     struct perf_evsel *evsel, size_t privsize,

		     struct arch **parch, char *cpuid)

		     struct arch **parch)

{

	struct annotate_args args = {

		.privsize	= privsize,

		.map		= map,

		.evsel		= evsel,

	};

	struct perf_env *env = perf_evsel__env(evsel);

	const char *arch_name = NULL;

	struct arch *arch;

	int err;
@@ -1648,7 +1649,7 @@ int symbol__annotate(struct symbol *sym, struct map *map, 
		*parch = arch;



	if (arch->init) {

		err = arch->init(arch, cpuid);

		err = arch->init(arch, env ? env->cpuid : NULL);

		if (err) {

			pr_err("%s: failed to initialize %s arch priv area\n", __func__, arch->name);

			return err;
@@ -1999,7 +2000,7 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map, 
	struct dso *dso = map->dso;

	struct rb_root source_line = RB_ROOT;



	if (symbol__annotate(sym, map, evsel, 0, NULL, NULL) < 0)

	if (symbol__annotate(sym, map, evsel, 0, NULL) < 0)

		return -1;



	symbol__calc_percent(sym, evsel);

tools/perf/util/annotate.h

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ void symbol__annotate_zero_histograms(struct symbol *sym); 


int symbol__annotate(struct symbol *sym, struct map *map,

		     struct perf_evsel *evsel, size_t privsize,

		     struct arch **parch, char *cpuid);

		     struct arch **parch);



enum symbol_disassemble_errno {

	SYMBOL_ANNOTATE_ERRNO__SUCCESS		= 0,