perf machine: Add machine__is() to identify machine arch (dbbd34a6) · Commits · 戴 / test

tools/perf/util/env.c

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -93,6 +93,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);

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -76,4 +76,6 @@ 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__arch(struct perf_env env);		const char perf_env__arch(struct perf_env env);
			const char perf_env__raw_arch(struct perf_env env);

	#endif /* __PERF_ENV_H */		#endif /* __PERF_ENV_H */

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2296,6 +2296,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);

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -188,6 +188,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);