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

Commit 2caa48a2 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf header: Stop using die() calls when processing tracing data 

The callers of this function (perf_event__process_tracing_data) already
handles a negative value return as error, so just use pr_err() to log
the problem and return -1 instead of panic'ing.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-eeeljnecpi0zi5s7ux1mzdv9@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8d9233f2

tools/perf/util/header.c

+12 −6
Original line number Diff line number Diff line
@@ -2921,16 +2921,22 @@ int perf_event__process_tracing_data(union perf_event *event, 
				 session->repipe);

	padding = PERF_ALIGN(size_read, sizeof(u64)) - size_read;



	if (readn(session->fd, buf, padding) < 0)

		die("reading input file");

	if (readn(session->fd, buf, padding) < 0) {

		pr_err("%s: reading input file", __func__);

		return -1;

	}

	if (session->repipe) {

		int retw = write(STDOUT_FILENO, buf, padding);

		if (retw <= 0 || retw != padding)

			die("repiping tracing data padding");

		if (retw <= 0 || retw != padding) {

			pr_err("%s: repiping tracing data padding", __func__);

			return -1;

		}

	}



	if (size_read + padding != size)

		die("tracing data size mismatch");

	if (size_read + padding != size) {

		pr_err("%s: tracing data size mismatch", __func__);

		return -1;

	}



	perf_evlist__prepare_tracepoint_events(session->evlist,

					       session->pevent);