leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf annotate: Use perf_env when obtaining the arch name

Browse Source 
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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2017-12-11 12:52:17 -03:00
parent 5449f13c55
commit 3285debaf5
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/perf/util/annotate.c
View File

@ -1420,16 +1420,19 @@ fallback:
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;

7
tools/perf/util/evsel.c
View File

@ -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)

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

@ -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 */