2013-07-18 20:05:21

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: [PATCH 25/76] perf util: Save long size of traced system

From: Namhyung Kim <[email protected]>

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 <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Steven Rostedt <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
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);
--
1.8.1.4