aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-record.c
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2016-09-23 10:38:36 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-09-29 10:17:00 -0400
commit394c01ed8aafdf0f14fb18c6d320d8a783da243c (patch)
tree1e3675b2c87ea0f6d1d708953f5ebb39fbb910de /tools/perf/builtin-record.c
parente7a06a5353574cac3a34211bd4e514bb8d00d766 (diff)
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>
Diffstat (limited to 'tools/perf/builtin-record.c')
-rw-r--r--tools/perf/builtin-record.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 2d0d69be3bf8..b32a880ec473 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -1643,7 +1643,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
1643 if (rec->evlist->nr_entries == 0 && 1643 if (rec->evlist->nr_entries == 0 &&
1644 perf_evlist__add_default(rec->evlist) < 0) { 1644 perf_evlist__add_default(rec->evlist) < 0) {
1645 pr_err("Not enough memory for event selector list\n"); 1645 pr_err("Not enough memory for event selector list\n");
1646 goto out_symbol_exit; 1646 goto out;
1647 } 1647 }
1648 1648
1649 if (rec->opts.target.tid && !rec->opts.no_inherit_set) 1649 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)
1663 ui__error("%s", errbuf); 1663 ui__error("%s", errbuf);
1664 1664
1665 err = -saved_errno; 1665 err = -saved_errno;
1666 goto out_symbol_exit; 1666 goto out;
1667 } 1667 }
1668 1668
1669 err = -ENOMEM; 1669 err = -ENOMEM;
@@ -1672,7 +1672,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
1672 1672
1673 err = auxtrace_record__options(rec->itr, rec->evlist, &rec->opts); 1673 err = auxtrace_record__options(rec->itr, rec->evlist, &rec->opts);
1674 if (err) 1674 if (err)
1675 goto out_symbol_exit; 1675 goto out;
1676 1676
1677 /* 1677 /*
1678 * We take all buildids when the file contains 1678 * 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)
1684 1684
1685 if (record_opts__config(&rec->opts)) { 1685 if (record_opts__config(&rec->opts)) {
1686 err = -EINVAL; 1686 err = -EINVAL;
1687 goto out_symbol_exit; 1687 goto out;
1688 } 1688 }
1689 1689
1690 err = __cmd_record(&record, argc, argv); 1690 err = __cmd_record(&record, argc, argv);
1691out_symbol_exit: 1691out:
1692 perf_evlist__delete(rec->evlist); 1692 perf_evlist__delete(rec->evlist);
1693 symbol__exit(); 1693 symbol__exit();
1694 auxtrace_record__free(rec->itr); 1694 auxtrace_record__free(rec->itr);