Commit ebf3c675 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo

perf tools: Cleanup calc_data_size logic

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.
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1363850332-25297-10-git-send-email-namhyung@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 452958fd
......@@ -43,7 +43,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)
......@@ -83,8 +83,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;
}
......@@ -155,8 +154,7 @@ static char *read_string(void)
break;
}
if (calc_data_size)
calc_data_size += size;
trace_data_size += size;
str = malloc(size);
if (str)
......@@ -356,9 +354,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)
......@@ -417,8 +413,7 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)
if (err)
goto out;
size = calc_data_size - 1;
calc_data_size = 0;
size = trace_data_size;
repipe = false;
if (show_funcs) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment