perf record: Rename label 'out_symbol_exit'
In preparation for fixing the error paths, rename label 'out_symbol_exit' to be 'out' because that error path can be used irrespective of whether symbols (or anything else) has been initialized. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Link: http://lkml.kernel.org/r/1474641528-18776-5-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
e7a06a5353
commit
394c01ed8a
|
@ -1643,7 +1643,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
|
||||||
if (rec->evlist->nr_entries == 0 &&
|
if (rec->evlist->nr_entries == 0 &&
|
||||||
perf_evlist__add_default(rec->evlist) < 0) {
|
perf_evlist__add_default(rec->evlist) < 0) {
|
||||||
pr_err("Not enough memory for event selector list\n");
|
pr_err("Not enough memory for event selector list\n");
|
||||||
goto out_symbol_exit;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rec->opts.target.tid && !rec->opts.no_inherit_set)
|
if (rec->opts.target.tid && !rec->opts.no_inherit_set)
|
||||||
|
@ -1663,7 +1663,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
|
||||||
ui__error("%s", errbuf);
|
ui__error("%s", errbuf);
|
||||||
|
|
||||||
err = -saved_errno;
|
err = -saved_errno;
|
||||||
goto out_symbol_exit;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
err = -ENOMEM;
|
err = -ENOMEM;
|
||||||
|
@ -1672,7 +1672,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
|
||||||
|
|
||||||
err = auxtrace_record__options(rec->itr, rec->evlist, &rec->opts);
|
err = auxtrace_record__options(rec->itr, rec->evlist, &rec->opts);
|
||||||
if (err)
|
if (err)
|
||||||
goto out_symbol_exit;
|
goto out;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We take all buildids when the file contains
|
* We take all buildids when the file contains
|
||||||
|
@ -1684,11 +1684,11 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
|
||||||
|
|
||||||
if (record_opts__config(&rec->opts)) {
|
if (record_opts__config(&rec->opts)) {
|
||||||
err = -EINVAL;
|
err = -EINVAL;
|
||||||
goto out_symbol_exit;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
err = __cmd_record(&record, argc, argv);
|
err = __cmd_record(&record, argc, argv);
|
||||||
out_symbol_exit:
|
out:
|
||||||
perf_evlist__delete(rec->evlist);
|
perf_evlist__delete(rec->evlist);
|
||||||
symbol__exit();
|
symbol__exit();
|
||||||
auxtrace_record__free(rec->itr);
|
auxtrace_record__free(rec->itr);
|
||||||
|
|
Loading…
Reference in New Issue