Commit e404a629 authored by Adrian Hunter's avatar Adrian Hunter Committed by Greg Kroah-Hartman

perf machine: Add machine__is() to identify machine arch

commit dbbd34a6 upstream.

Add a function to identify the machine architecture.
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Tested-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86@kernel.org
Link: http://lkml.kernel.org/r/1526548928-20790-6-git-send-email-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8c209c38
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include "env.h" #include "env.h"
#include "util.h" #include "util.h"
#include <errno.h> #include <errno.h>
#include <sys/utsname.h>
struct perf_env perf_env; struct perf_env perf_env;
...@@ -87,6 +88,24 @@ int perf_env__read_cpu_topology_map(struct perf_env *env) ...@@ -87,6 +88,24 @@ int perf_env__read_cpu_topology_map(struct perf_env *env)
return 0; return 0;
} }
static int perf_env__read_arch(struct perf_env *env)
{
struct utsname uts;
if (env->arch)
return 0;
if (!uname(&uts))
env->arch = strdup(uts.machine);
return env->arch ? 0 : -ENOMEM;
}
const char *perf_env__raw_arch(struct perf_env *env)
{
return env && !perf_env__read_arch(env) ? env->arch : "unknown";
}
void cpu_cache_level__free(struct cpu_cache_level *cache) void cpu_cache_level__free(struct cpu_cache_level *cache)
{ {
free(cache->type); free(cache->type);
......
...@@ -65,4 +65,7 @@ int perf_env__set_cmdline(struct perf_env *env, int argc, const char *argv[]); ...@@ -65,4 +65,7 @@ int perf_env__set_cmdline(struct perf_env *env, int argc, const char *argv[]);
int perf_env__read_cpu_topology_map(struct perf_env *env); int perf_env__read_cpu_topology_map(struct perf_env *env);
void cpu_cache_level__free(struct cpu_cache_level *cache); void cpu_cache_level__free(struct cpu_cache_level *cache);
const char *perf_env__raw_arch(struct perf_env *env);
#endif /* __PERF_ENV_H */ #endif /* __PERF_ENV_H */
...@@ -2238,6 +2238,15 @@ int machine__set_current_tid(struct machine *machine, int cpu, pid_t pid, ...@@ -2238,6 +2238,15 @@ int machine__set_current_tid(struct machine *machine, int cpu, pid_t pid,
return 0; return 0;
} }
/*
* Compares the raw arch string. N.B. see instead perf_env__arch() if a
* normalized arch is needed.
*/
bool machine__is(struct machine *machine, const char *arch)
{
return machine && !strcmp(perf_env__raw_arch(machine->env), arch);
}
int machine__get_kernel_start(struct machine *machine) int machine__get_kernel_start(struct machine *machine)
{ {
struct map *map = machine__kernel_map(machine); struct map *map = machine__kernel_map(machine);
......
...@@ -169,6 +169,8 @@ static inline bool machine__is_host(struct machine *machine) ...@@ -169,6 +169,8 @@ static inline bool machine__is_host(struct machine *machine)
return machine ? machine->pid == HOST_KERNEL_ID : false; return machine ? machine->pid == HOST_KERNEL_ID : false;
} }
bool machine__is(struct machine *machine, const char *arch);
struct thread *__machine__findnew_thread(struct machine *machine, pid_t pid, pid_t tid); struct thread *__machine__findnew_thread(struct machine *machine, pid_t pid, pid_t tid);
struct thread *machine__findnew_thread(struct machine *machine, pid_t pid, pid_t tid); struct thread *machine__findnew_thread(struct machine *machine, pid_t pid, pid_t tid);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment