Skip to content

Commit d5652d8

Browse files
ahunter6acmel
authored andcommitted
perf session: Add ability to skip 4GiB or more
A session can be made to skip portions of the input file. Do not limit that size to 32-bits. Signed-off-by: Adrian Hunter <[email protected]> Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 6f917c7 commit d5652d8

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

tools/perf/util/session.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -994,8 +994,10 @@ static int perf_session_deliver_event(struct perf_session *session,
994994
}
995995
}
996996

997-
static int perf_session__process_user_event(struct perf_session *session, union perf_event *event,
998-
struct perf_tool *tool, u64 file_offset)
997+
static s64 perf_session__process_user_event(struct perf_session *session,
998+
union perf_event *event,
999+
struct perf_tool *tool,
1000+
u64 file_offset)
9991001
{
10001002
int fd = perf_data_file__fd(session->file);
10011003
int err;
@@ -1037,7 +1039,7 @@ static void event_swap(union perf_event *event, bool sample_id_all)
10371039
swap(event, sample_id_all);
10381040
}
10391041

1040-
static int perf_session__process_event(struct perf_session *session,
1042+
static s64 perf_session__process_event(struct perf_session *session,
10411043
union perf_event *event,
10421044
struct perf_tool *tool,
10431045
u64 file_offset)
@@ -1148,7 +1150,7 @@ static int __perf_session__process_pipe_events(struct perf_session *session,
11481150
union perf_event *event;
11491151
uint32_t size, cur_size = 0;
11501152
void *buf = NULL;
1151-
int skip = 0;
1153+
s64 skip = 0;
11521154
u64 head;
11531155
ssize_t err;
11541156
void *p;
@@ -1277,14 +1279,13 @@ int __perf_session__process_events(struct perf_session *session,
12771279
u64 file_size, struct perf_tool *tool)
12781280
{
12791281
int fd = perf_data_file__fd(session->file);
1280-
u64 head, page_offset, file_offset, file_pos;
1282+
u64 head, page_offset, file_offset, file_pos, size;
12811283
int err, mmap_prot, mmap_flags, map_idx = 0;
12821284
size_t mmap_size;
12831285
char *buf, *mmaps[NUM_MMAPS];
12841286
union perf_event *event;
1285-
uint32_t size;
12861287
struct ui_progress prog;
1287-
int skip;
1288+
s64 skip;
12881289

12891290
perf_tool__fill_defaults(tool);
12901291

0 commit comments

Comments
 (0)