perf header: Stop using die() calls when processing tracing data
Commit-ID: 2caa48a24061b1f8e8dab43ea3292a608a15e3c9 Gitweb: http://git.kernel.org/tip/2caa48a24061b1f8e8dab43ea3292a608a15e3c9 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 24 Jan 2013 22:34:33 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 25 Jan 2013 12:49:29 -0300
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 <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/header.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
tools/perf/util/header.c +12 -6
@@ -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);