[PATCH 8/9] perf util: Get rid of die() calls in trace-data-read.c

[Namhyung Kim]

From: Namhyung Kim <namhyung....@lge.com>

Convert them to pr_debug() and propagate error code.

Cc: Steven Rostedt <rost...@goodmis.org>
Cc: Frederic Weisbecker <fweis...@gmail.com>
Signed-off-by: Namhyung Kim <namhy...@kernel.org>
---
 tools/perf/util/trace-event-read.c | 44 +++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/tools/perf/util/trace-event-read.c 
b/tools/perf/util/trace-event-read.c
index 87f0ccd54cdc..7ce901643205 100644
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -132,17 +132,23 @@ static char *read_string(void)
 
        for (;;) {
                r = read(input_fd, &c, 1);
-               if (r < 0)
-                       die("reading input file");
+               if (r < 0) {
+                       pr_debug("reading input file");
+                       goto out;
+               }
 
-               if (!r)
-                       die("no data");
+               if (!r) {
+                       pr_debug("no data");
+                       goto out;
+               }
 
                if (repipe) {
                        int retw = write(STDOUT_FILENO, &c, 1);
 
-                       if (retw <= 0 || retw != r)
-                               die("repiping input file string");
+                       if (retw <= 0 || retw != r) {
+                               pr_debug("repiping input file string");
+                               goto out;
+                       }
                }
 
                buf[size++] = c;
@@ -157,7 +163,7 @@ static char *read_string(void)
        str = malloc(size);
        if (str)
                memcpy(str, buf, size);
-
+out:
        return str;
 }
 
@@ -221,8 +227,10 @@ static int read_header_files(struct pevent *pevent)
        if (do_read(buf, 12) < 0)
                return -1;
 
-       if (memcmp(buf, "header_page", 12) != 0)
-               die("did not read header page");
+       if (memcmp(buf, "header_page", 12) != 0) {
+               pr_debug("did not read header page");
+               return -1;
+       }
 
        size = read8(pevent);
        skip(size);
@@ -236,8 +244,10 @@ static int read_header_files(struct pevent *pevent)
        if (do_read(buf, 13) < 0)
                return -1;
 
-       if (memcmp(buf, "header_event", 13) != 0)
-               die("did not read header event");
+       if (memcmp(buf, "header_event", 13) != 0) {
+               pr_debug("did not read header event");
+               return -1;
+       }
 
        size = read8(pevent);
        header_event = malloc(size);
@@ -354,13 +364,17 @@ ssize_t trace_report(int fd, struct pevent **ppevent, 
bool __repipe)
 
        if (do_read(buf, 3) < 0)
                return -1;
-       if (memcmp(buf, test, 3) != 0)
-               die("no trace data in the file");
+       if (memcmp(buf, test, 3) != 0) {
+               pr_debug("no trace data in the file");
+               return -1;
+       }
 
        if (do_read(buf, 7) < 0)
                return -1;
-       if (memcmp(buf, "tracing", 7) != 0)
-               die("not a trace file (missing 'tracing' tag)");
+       if (memcmp(buf, "tracing", 7) != 0) {
+               pr_debug("not a trace file (missing 'tracing' tag)");
+               return -1;
+       }
 
        version = read_string();
        if (version == NULL)
-- 
1.7.11.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/