Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9a70bbc authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

perf tools: Don't die() in perf_header__new() 



Propagate the errors instead, the users are the ones to decide
what to do if a library call fails.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <1258427892-16312-3-git-send-email-acme@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 58754121

tools/perf/builtin-record.c

+5 −0
Original line number Diff line number Diff line
@@ -439,6 +439,11 @@ static int __cmd_record(int argc, const char **argv) 
	else

		header = perf_header__new();



	if (header == NULL) {

		pr_err("Not enough memory for reading perf file header\n");

		return -1;

	}



	if (raw_samples) {

		perf_header__set_feat(header, HEADER_TRACE_INFO);

	} else {

tools/perf/util/header.c

+11 −7
Original line number Diff line number Diff line
@@ -65,14 +65,15 @@ struct perf_header *perf_header__new(void) 
{

	struct perf_header *self = calloc(sizeof(*self), 1);



	if (!self)

		die("nomem");



	if (self != NULL) {

		self->size = 1;

		self->attr = malloc(sizeof(void *));



	if (!self->attr)

		die("nomem");

		if (self->attr == NULL) {

			free(self);

			self = NULL;

		}

	}



	return self;

}
@@ -426,6 +427,9 @@ struct perf_header *perf_header__read(int fd) 
	u64			f_id;

	int nr_attrs, nr_ids, i, j;



	if (self == NULL)

		die("nomem");



	if (perf_file_header__read(&f_header, self, fd) < 0)

		die("incompatible file format");