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

Commit 3285deba authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf annotate: Use perf_env when obtaining the arch name 

Paving the way to reuse these routines in other areas, like when
generating errno tables.

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-rh1qv051vb8gfdcswskrn53h@git.kernel.org


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

tools/perf/util/annotate.c

+8 −9
Original line number Diff line number Diff line
@@ -1420,16 +1420,19 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil 
	return 0;

}



static const char *annotate__norm_arch(const char *arch_name)

static const char *perf_env__arch(struct perf_env *env)

{

	struct utsname uts;

	char *arch_name;



	if (!arch_name) { /* Assume we are annotating locally. */

	if (!env) { /* Assume local operation */

		if (uname(&uts) < 0)

			return NULL;

		arch_name = uts.machine;

	}

	return normalize_arch((char *)arch_name);

	} else

		arch_name = env->arch;



	return normalize_arch(arch_name);

}



static int symbol__disassemble(struct symbol *sym, struct annotate_args *args)
@@ -1630,14 +1633,10 @@ int symbol__annotate(struct symbol *sym, struct map *map, 
		.evsel		= evsel,

	};

	struct perf_env *env = perf_evsel__env(evsel);

	const char *arch_name = NULL;

	const char *arch_name = perf_env__arch(env);

	struct arch *arch;

	int err;



	if (evsel)

		arch_name = perf_evsel__env_arch(evsel);



	arch_name = annotate__norm_arch(arch_name);

	if (!arch_name)

		return -1;

tools/perf/util/evsel.c

+0 −7
Original line number Diff line number Diff line
@@ -2835,13 +2835,6 @@ int perf_evsel__open_strerror(struct perf_evsel *evsel, struct target *target, 
			 perf_evsel__name(evsel));

}



char *perf_evsel__env_arch(struct perf_evsel *evsel)

{

	if (evsel && evsel->evlist && evsel->evlist->env)

		return evsel->evlist->env->arch;

	return NULL;

}



struct perf_env *perf_evsel__env(struct perf_evsel *evsel)

{

	if (evsel && evsel->evlist)

tools/perf/util/evsel.h

+0 −1
Original line number Diff line number Diff line
@@ -446,7 +446,6 @@ typedef int (*attr__fprintf_f)(FILE *, const char *, const char *, void *); 
int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,

			     attr__fprintf_f attr__fprintf, void *priv);



char *perf_evsel__env_arch(struct perf_evsel *evsel);

struct perf_env *perf_evsel__env(struct perf_evsel *evsel);



#endif /* __PERF_EVSEL_H */