[tip:perf/core] perf util: Save long size of traced system

tip-bot for Namhyung Kim
2013-07-19T07:47:07Z

Commit-ID: 59657f9c8dd91363f1c94c1f749b33ecf626cfc2
Gitweb: http://git.kernel.org/tip/59657f9c8dd91363f1c94c1f749b33ecf626cfc2
Author: Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Tue, 4 Jun 2013 14:20:23 +0900
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 12 Jul 2013 13:52:19 -0300

perf util: Save long size of traced system

Save size of long type of system to struct pevent. Since original
static variable was not used anywhere, just get rid of it.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
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/1370323231-14022-9-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/trace-event-read.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index c6b491b..6166294 100644
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -41,7 +41,6 @@ static int input_fd;

int file_bigendian;
int host_bigendian;
-static int long_size;

static ssize_t trace_data_size;
static bool repipe;
@@ -231,12 +230,6 @@ static int read_header_files(struct pevent *pevent)
size = read8(pevent);
skip(size);

- /*
- * The size field in the page is of type long,
- * use that instead, since it represents the kernel.
- */
- long_size = header_page_size_size;
-
if (do_read(buf, 13) < 0)
return -1;

@@ -349,6 +342,7 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)
int show_funcs = 0;
int show_printk = 0;
ssize_t size = -1;
+ int file_long_size;
int file_page_size;
struct pevent *pevent;
int err;
@@ -392,12 +386,13 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)

if (do_read(buf, 1) < 0)
goto out;
- long_size = buf[0];
+ file_long_size = buf[0];

file_page_size = read4(pevent);
if (!file_page_size)
goto out;

+ pevent_set_long_size(pevent, file_long_size);
pevent_set_page_size(pevent, file_page_size);

err = read_header_files(pevent);