Skip to content

Commit

Permalink
perf util: Save long size of traced system
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Namhyung Kim authored and Arnaldo Carvalho de Melo committed Jul 12, 2013
1 parent 30f3676 commit 59657f9
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions tools/perf/util/trace-event-read.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 59657f9

Please sign in to comment.