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

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

perf symbols: Rename [sl]name_alloc to match the members they refer to 



So we now have:

   dso->short_name
   dso->short_name_len
   dso->short_name_allocated

Ditto for the 'long  variants. To more quickly grasp what they refer to.

Suggested-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-nu228f8vlp9w0lr7c0q77dqi@git.kernel.org


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

tools/perf/util/dso.c

+2 −2
Original line number Diff line number Diff line
@@ -465,9 +465,9 @@ void dso__delete(struct dso *dso) 
	int i;

	for (i = 0; i < MAP__NR_TYPES; ++i)

		symbols__delete(&dso->symbols[i]);

	if (dso->sname_alloc)

	if (dso->short_name_allocated)

		free((char *)dso->short_name);

	if (dso->lname_alloc)

	if (dso->long_name_allocated)

		free(dso->long_name);

	dso_cache__free(&dso->cache);

	dso__free_a2l(dso);

tools/perf/util/dso.h

+2 −2
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ struct dso { 
	u8		 has_srcline:1;

	u8		 hit:1;

	u8		 annotate_warned:1;

	u8		 sname_alloc:1;

	u8		 lname_alloc:1;

	u8		 short_name_allocated:1;

	u8		 long_name_allocated:1;

	u8		 sorted_by_name;

	u8		 loaded;

	u8		 rel;

tools/perf/util/machine.c

+2 −2
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ static int map_groups__set_modules_path_dir(struct map_groups *mg, 
				goto out;

			}

			dso__set_long_name(map->dso, long_name);

			map->dso->lname_alloc = 1;

			map->dso->long_name_allocated = 1;

			dso__kernel_module_get_build_id(map->dso, "");

		}

	}
@@ -936,7 +936,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine, 
			goto out_problem;



		map->dso->short_name = name;

		map->dso->sname_alloc = 1;

		map->dso->short_name_allocated = 1;

		map->end = map->start + event->mmap.len;

	} else if (is_kernel_mmap) {

		const char *symbol_name = (event->mmap.filename +

tools/perf/util/symbol.c

+3 −3
Original line number Diff line number Diff line
@@ -1458,7 +1458,7 @@ int dso__load_vmlinux_path(struct dso *dso, struct map *map, 
	if (filename != NULL) {

		err = dso__load_vmlinux(dso, map, filename, filter);

		if (err > 0) {

			dso->lname_alloc = 1;

			dso->long_name_allocated = 1;

			goto out;

		}

		free(filename);
@@ -1468,7 +1468,7 @@ int dso__load_vmlinux_path(struct dso *dso, struct map *map, 
		err = dso__load_vmlinux(dso, map, vmlinux_path[i], filter);

		if (err > 0) {

			dso__set_long_name(dso, strdup(vmlinux_path[i]));

			dso->lname_alloc = 1;

			dso->long_name_allocated = 1;

			break;

		}

	}
@@ -1612,7 +1612,7 @@ static int dso__load_kernel_sym(struct dso *dso, struct map *map, 
		if (err > 0) {

			dso__set_long_name(dso,

					   strdup(symbol_conf.vmlinux_name));

			dso->lname_alloc = 1;

			dso->long_name_allocated = 1;

			return err;

		}

		return err;