The dso__load* functions return the number symbols they were able to load or -1 in case of error.
But it is a bit confusing to determine 'if (err > 0)' indicates success or failure and we have to step several functions deep to find that out. Rename the variable 'err' so it is hopefully easier to understand. Signed-off-by: Sukadev Bhattiprolu <suka...@linux.vnet.ibm.com> --- tools/perf/util/symbol.c | 50 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index be84f7a..9b66e27 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -1467,7 +1467,7 @@ int dso__load_vmlinux(struct dso *dso, struct map *map, const char *vmlinux, bool vmlinux_allocated, symbol_filter_t filter) { - int err = -1; + int nsyms = -1; struct symsrc ss; char symfs_vmlinux[PATH_MAX]; enum dso_binary_type symtab_type; @@ -1485,10 +1485,10 @@ int dso__load_vmlinux(struct dso *dso, struct map *map, if (symsrc__init(&ss, dso, symfs_vmlinux, symtab_type)) return -1; - err = dso__load_sym(dso, map, &ss, &ss, filter, 0); + nsyms = dso__load_sym(dso, map, &ss, &ss, filter, 0); symsrc__destroy(&ss); - if (err > 0) { + if (nsyms > 0) { if (dso->kernel == DSO_TYPE_GUEST_KERNEL) dso->binary_type = DSO_BINARY_TYPE__GUEST_VMLINUX; else @@ -1498,13 +1498,13 @@ int dso__load_vmlinux(struct dso *dso, struct map *map, pr_debug("Using %s for symbols\n", symfs_vmlinux); } - return err; + return nsyms; } int dso__load_vmlinux_path(struct dso *dso, struct map *map, symbol_filter_t filter) { - int i, err = 0; + int i, nsyms = 0; char *filename; pr_debug("Looking at the vmlinux_path (%d entries long)\n", @@ -1512,19 +1512,19 @@ int dso__load_vmlinux_path(struct dso *dso, struct map *map, filename = dso__build_id_filename(dso, NULL, 0); if (filename != NULL) { - err = dso__load_vmlinux(dso, map, filename, true, filter); - if (err > 0) + nsyms = dso__load_vmlinux(dso, map, filename, true, filter); + if (nsyms > 0) goto out; free(filename); } for (i = 0; i < vmlinux_path__nr_entries; ++i) { - err = dso__load_vmlinux(dso, map, vmlinux_path[i], false, filter); - if (err > 0) + nsyms = dso__load_vmlinux(dso, map, vmlinux_path[i], false, filter); + if (nsyms > 0) break; } out: - return err; + return nsyms; } static int find_matching_kcore(struct map *map, char *dir, size_t dir_sz) @@ -1634,7 +1634,7 @@ proc_kallsyms: static int dso__load_kernel_sym(struct dso *dso, struct map *map, symbol_filter_t filter) { - int err; + int nsyms; const char *kallsyms_filename = NULL; char *kallsyms_allocated_filename = NULL; /* @@ -1663,9 +1663,9 @@ static int dso__load_kernel_sym(struct dso *dso, struct map *map, } if (!symbol_conf.ignore_vmlinux && vmlinux_path != NULL) { - err = dso__load_vmlinux_path(dso, map, filter); - if (err > 0) - return err; + nsyms = dso__load_vmlinux_path(dso, map, filter); + if (nsyms > 0) + return nsyms; } /* do not try local files if a symfs was given */ @@ -1679,25 +1679,25 @@ static int dso__load_kernel_sym(struct dso *dso, struct map *map, kallsyms_filename = kallsyms_allocated_filename; do_kallsyms: - err = dso__load_kallsyms(dso, kallsyms_filename, map, filter); - if (err > 0) + nsyms = dso__load_kallsyms(dso, kallsyms_filename, map, filter); + if (nsyms > 0) pr_debug("Using %s for symbols\n", kallsyms_filename); free(kallsyms_allocated_filename); - if (err > 0 && !dso__is_kcore(dso)) { + if (nsyms > 0 && !dso__is_kcore(dso)) { dso->binary_type = DSO_BINARY_TYPE__KALLSYMS; dso__set_long_name(dso, "[kernel.kallsyms]", false); map__fixup_start(map); map__fixup_end(map); } - return err; + return nsyms; } static int dso__load_guest_kernel_sym(struct dso *dso, struct map *map, symbol_filter_t filter) { - int err; + int nsyms; const char *kallsyms_filename = NULL; struct machine *machine; char path[PATH_MAX]; @@ -1715,10 +1715,10 @@ static int dso__load_guest_kernel_sym(struct dso *dso, struct map *map, * Or use file guest_kallsyms inputted by user on commandline */ if (symbol_conf.default_guest_vmlinux_name != NULL) { - err = dso__load_vmlinux(dso, map, + nsyms = dso__load_vmlinux(dso, map, symbol_conf.default_guest_vmlinux_name, false, filter); - return err; + return nsyms; } kallsyms_filename = symbol_conf.default_guest_kallsyms; @@ -1729,10 +1729,10 @@ static int dso__load_guest_kernel_sym(struct dso *dso, struct map *map, kallsyms_filename = path; } - err = dso__load_kallsyms(dso, kallsyms_filename, map, filter); - if (err > 0) + nsyms = dso__load_kallsyms(dso, kallsyms_filename, map, filter); + if (nsyms > 0) pr_debug("Using %s for symbols\n", kallsyms_filename); - if (err > 0 && !dso__is_kcore(dso)) { + if (nsyms > 0 && !dso__is_kcore(dso)) { dso->binary_type = DSO_BINARY_TYPE__GUEST_KALLSYMS; machine__mmap_name(machine, path, sizeof(path)); dso__set_long_name(dso, strdup(path), true); @@ -1740,7 +1740,7 @@ static int dso__load_guest_kernel_sym(struct dso *dso, struct map *map, map__fixup_end(map); } - return err; + return nsyms; } static void vmlinux_path__exit(void) -- 1.8.3.1 -- 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/