From: Arnaldo Carvalho de Melo <a...@redhat.com> 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: Ingo Molnar <mi...@kernel.org> Cc: Adrian Hunter <adrian.hun...@intel.com> Cc: David Ahern <dsah...@gmail.com> Cc: Frederic Weisbecker <fweis...@gmail.com> Cc: Jiri Olsa <jo...@redhat.com> Cc: Mike Galbraith <efa...@gmx.de> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Paul Mackerras <pau...@samba.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Stephane Eranian <eran...@google.com> Link: http://lkml.kernel.org/n/tip-nu228f8vlp9w0lr7c0q77...@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/util/dso.c | 4 ++-- tools/perf/util/dso.h | 4 ++-- tools/perf/util/machine.c | 4 ++-- tools/perf/util/symbol.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index a0c7c591f4b2..55c983586b05 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -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); diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h index 384f2d97e38e..00a232d89607 100644 --- a/tools/perf/util/dso.h +++ b/tools/perf/util/dso.h @@ -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; diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index bac817ab2068..f66f309a091a 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -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 + diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index de87dbac50a0..265a149bc43f 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -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; -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
