Em Mon, Nov 18, 2013 at 01:32:46PM -0700, David Ahern escreveu: > Save vmlinux or kallsyms path loaded using embedded default lookup (ie., > not a user specified path). Upcoming perf sched timehist command requires > kernel symbols for properly computing idle times and prints a warning > if the kernel symbols are not loaded.
What would happen if strdup failed here? Why don't we undo anything done so far in this function and return an error? - Arnaldo > Signed-off-by: David Ahern <[email protected]> > Cc: Ingo Molnar <[email protected]> > Cc: Jiri Olsa <[email protected]> > Cc: Namhyung Kim <[email protected]> > Cc: Frederic Weisbecker <[email protected]> > Cc: Peter Zijlstra <[email protected]> > Cc: Stephane Eranian <[email protected]> > --- > tools/perf/util/symbol.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c > index f55c18da1e40..915eb6c4a248 100644 > --- a/tools/perf/util/symbol.c > +++ b/tools/perf/util/symbol.c > @@ -1437,6 +1437,8 @@ int dso__load_vmlinux(struct dso *dso, struct map *map, > dso->data_type = DSO_BINARY_TYPE__VMLINUX; > dso__set_long_name(dso, (char *)vmlinux); > dso__set_loaded(dso, map->type); > + if (symbol_conf.vmlinux_name == NULL) > + symbol_conf.vmlinux_name = strdup(symfs_vmlinux); > pr_debug("Using %s for symbols\n", symfs_vmlinux); > } > > @@ -1629,8 +1631,11 @@ static int dso__load_kernel_sym(struct dso *dso, > struct map *map, > > do_kallsyms: > err = dso__load_kallsyms(dso, kallsyms_filename, map, filter); > - if (err > 0) > + if (err > 0) { > + if (symbol_conf.kallsyms_name == NULL) > + symbol_conf.kallsyms_name = strdup(kallsyms_filename); > pr_debug("Using %s for symbols\n", kallsyms_filename); > + } > free(kallsyms_allocated_filename); > > if (err > 0 && !dso__is_kcore(dso)) { > -- > 1.8.3.4 (Apple Git-47) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
