perf annotate: Return appropriate error code for allocation failures
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 16ed3c1e91159e28b02f11f71ff4ce4cbc6f99e4 Gitweb: https://git.kernel.org/tip/16ed3c1e91159e28b02f11f71ff4ce4cbc6f99e4 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 30 Sep 2019 15:53:33 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 30 Sep 2019 17:30:04 -03:00
perf annotate: Return appropriate error code for allocation failures
We should return errno or the annotation extra range understood by symbol__strerror_disassemble() instead of -1, fix it, returning ENOMEM instead.
Cc Adrian Hunter <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>,
Cc Will Deacon <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/annotate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/annotate.c +2 -2
@@ -1668,7 +1668,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil build_id_path =strdup (filename);if (!build_id_path) -return -1 ; +return ENOMEM ;/* * old style build-id cache has name of XX/XXXXXXX.. while
@@ -2977,7 +2977,7 @@ int symbol__annotate2(struct symbol *sym, struct map *map, struct evsel *evsel, notes->offsets =zalloc (size *sizeof (struct annotation_line *));if (notes->offsets ==NULL ) -return -1 ; +return ENOMEM ;if (perf_evsel__is_group_event (evsel)) nr_pcnt = evsel->core.nr_members;