lkml.org 
[lkml]   [2013]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 9/9] perf util: Cleanup calc_data_size logic
Date
From: Namhyung Kim <namhyung.kim@lge.com>

It's for calculating whole trace data size during reading. However
relation functions are called only in this file, no need to
conditionalize it with tricky +1 offset and rename the variable to
more meaningful name like trace_data_size.

Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/trace-event-read.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index 7ce901643205..6b0a2c2a4091 100644
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -45,7 +45,7 @@ int file_bigendian;
int host_bigendian;
static int long_size;

-static ssize_t calc_data_size;
+static ssize_t trace_data_size;
static bool repipe;

static int __do_read(int fd, void *buf, int size)
@@ -85,8 +85,7 @@ static int do_read(void *data, int size)
return -1;
}

- if (calc_data_size)
- calc_data_size += r;
+ trace_data_size += r;

return r;
}
@@ -157,8 +156,7 @@ static char *read_string(void)
break;
}

- if (calc_data_size)
- calc_data_size += size;
+ trace_data_size += size;

str = malloc(size);
if (str)
@@ -357,9 +355,7 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)

*ppevent = NULL;

- calc_data_size = 1;
repipe = __repipe;
-
input_fd = fd;

if (do_read(buf, 3) < 0)
@@ -409,8 +405,7 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)
read_ftrace_printk(pevent))
goto out;

- size = calc_data_size - 1;
- calc_data_size = 0;
+ size = trace_data_size;
repipe = false;

if (show_funcs) {
--
1.7.11.7


\
 
 \ /
  Last update: 2013-03-19 10:41    [W:0.244 / U:0.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site