Commit 1c695c88 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Rename 'enum dso_kernel_type' to 'enum dso_space_type' 



Rename enum dso_kernel_type to enum dso_space_type, which seems like
better fit.

Committer notes:

This is used with 'struct dso'->kernel, which once was a boolean, so
DSO_SPACE__USER is zero, !zero means some sort of kernel space, be it
the host kernel space or a guest kernel space.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ceafdd66

tools/perf/util/dso.c

+1 −1
Original line number Diff line number Diff line
@@ -1265,7 +1265,7 @@ struct dso *dso__new_id(const char *name, struct dso_id *id) 
		dso->has_build_id = 0;

		dso->has_srcline = 1;

		dso->a2l_fails = 1;

		dso->kernel = DSO_TYPE_USER;

		dso->kernel = DSO_SPACE__USER;

		dso->needs_swap = DSO_SWAP__UNSET;

		dso->comp = COMP_ID__NONE;

		RB_CLEAR_NODE(&dso->rb_node);

tools/perf/util/dso.h

+5 −5
Original line number Diff line number Diff line
@@ -46,10 +46,10 @@ enum dso_binary_type { 
	DSO_BINARY_TYPE__NOT_FOUND,

};



enum dso_kernel_type {

	DSO_TYPE_USER = 0,

	DSO_TYPE_KERNEL,

	DSO_TYPE_GUEST_KERNEL

enum dso_space_type {

	DSO_SPACE__USER = 0,

	DSO_SPACE__KERNEL,

	DSO_SPACE__KERNEL_GUEST

};



enum dso_swap_type {
@@ -160,7 +160,7 @@ struct dso { 
	void		 *a2l;

	char		 *symsrc_filename;

	unsigned int	 a2l_fails;

	enum dso_kernel_type	kernel;

	enum dso_space_type	kernel;

	enum dso_swap_type	needs_swap;

	enum dso_binary_type	symtab_type;

	enum dso_binary_type	binary_type;

tools/perf/util/header.c

+6 −6
Original line number Diff line number Diff line
@@ -2056,7 +2056,7 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev, 
	struct machine *machine;

	u16 cpumode;

	struct dso *dso;

	enum dso_kernel_type dso_type;

	enum dso_space_type dso_space;



	machine = perf_session__findnew_machine(session, bev->pid);

	if (!machine)
@@ -2066,14 +2066,14 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev, 


	switch (cpumode) {

	case PERF_RECORD_MISC_KERNEL:

		dso_type = DSO_TYPE_KERNEL;

		dso_space = DSO_SPACE__KERNEL;

		break;

	case PERF_RECORD_MISC_GUEST_KERNEL:

		dso_type = DSO_TYPE_GUEST_KERNEL;

		dso_space = DSO_SPACE__KERNEL_GUEST;

		break;

	case PERF_RECORD_MISC_USER:

	case PERF_RECORD_MISC_GUEST_USER:

		dso_type = DSO_TYPE_USER;

		dso_space = DSO_SPACE__USER;

		break;

	default:

		goto out;
@@ -2085,13 +2085,13 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev, 


		dso__set_build_id(dso, &bev->build_id);



		if (dso_type != DSO_TYPE_USER) {

		if (dso_space != DSO_SPACE__USER) {

			struct kmod_path m = { .name = NULL, };



			if (!kmod_path__parse_name(&m, filename) && m.kmod)

				dso__set_module_info(dso, &m, machine);

			else

				dso->kernel = dso_type;

				dso->kernel = dso_space;



			free(m.name);

		}

tools/perf/util/machine.c

+8 −8
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ static struct dso *machine__findnew_module_dso(struct machine *machine, 


		dso__set_module_info(dso, m, machine);

		dso__set_long_name(dso, strdup(filename), true);

		dso->kernel = DSO_TYPE_KERNEL;

		dso->kernel = DSO_SPACE__KERNEL;

	}



	dso__get(dso);
@@ -753,7 +753,7 @@ static int machine__process_ksymbol_register(struct machine *machine, 
		struct dso *dso = dso__new(event->ksymbol.name);



		if (dso) {

			dso->kernel = DSO_TYPE_KERNEL;

			dso->kernel = DSO_SPACE__KERNEL;

			map = map__new2(0, dso);

		}
@@ -971,14 +971,14 @@ static struct dso *machine__get_kernel(struct machine *machine) 
			vmlinux_name = symbol_conf.vmlinux_name;



		kernel = machine__findnew_kernel(machine, vmlinux_name,

						 "[kernel]", DSO_TYPE_KERNEL);

						 "[kernel]", DSO_SPACE__KERNEL);

	} else {

		if (symbol_conf.default_guest_vmlinux_name)

			vmlinux_name = symbol_conf.default_guest_vmlinux_name;



		kernel = machine__findnew_kernel(machine, vmlinux_name,

						 "[guest.kernel]",

						 DSO_TYPE_GUEST_KERNEL);

						 DSO_SPACE__KERNEL_GUEST);

	}



	if (kernel != NULL && (!kernel->has_build_id))
@@ -1606,7 +1606,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine, 
					      union perf_event *event)

{

	struct map *map;

	enum dso_kernel_type kernel_type;

	enum dso_space_type dso_space;

	bool is_kernel_mmap;



	/* If we have maps from kcore then we do not need or want any others */
@@ -1614,9 +1614,9 @@ static int machine__process_kernel_mmap_event(struct machine *machine, 
		return 0;



	if (machine__is_host(machine))

		kernel_type = DSO_TYPE_KERNEL;

		dso_space = DSO_SPACE__KERNEL;

	else

		kernel_type = DSO_TYPE_GUEST_KERNEL;

		dso_space = DSO_SPACE__KERNEL_GUEST;



	is_kernel_mmap = memcmp(event->mmap.filename,

				machine->mmap_name,
@@ -1676,7 +1676,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine, 
		if (kernel == NULL)

			goto out_problem;



		kernel->kernel = kernel_type;

		kernel->kernel = dso_space;

		if (__machine__create_kernel_maps(machine, kernel) < 0) {

			dso__put(kernel);

			goto out_problem;

tools/perf/util/map.c

+2 −2
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ u64 map__rip_2objdump(struct map *map, u64 rip) 
	 * kernel modules also have DSO_TYPE_USER in dso->kernel,

	 * but all kernel modules are ET_REL, so won't get here.

	 */

	if (map->dso->kernel == DSO_TYPE_USER)

	if (map->dso->kernel == DSO_SPACE__USER)

		return rip + map->dso->text_offset;



	return map->unmap_ip(map, rip) - map->reloc;
@@ -516,7 +516,7 @@ u64 map__objdump_2mem(struct map *map, u64 ip) 
	 * kernel modules also have DSO_TYPE_USER in dso->kernel,

	 * but all kernel modules are ET_REL, so won't get here.

	 */

	if (map->dso->kernel == DSO_TYPE_USER)

	if (map->dso->kernel == DSO_SPACE__USER)

		return map->unmap_ip(map, ip - map->dso->text_offset);



	return ip + map->reloc;

CRA Git | Maintained and supported by SUSTech CRA and CCSE