From d8ace8acc189ac70b3a5de105a632a47dd09d398 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 7 Dec 2010 12:48:50 +0000 Subject: [PATCH] --- yaml --- r: 223911 b: refs/heads/master c: e4c2df132fef60a28b851abc1859a531e64f350c h: refs/heads/master i: 223909: 03d2f274ced28c53f92514f1383f2bff453eee1d 223907: 209f567cd9825c6efd46bcb2f02db51c65dad8bf 223903: 1e3701e99d581d1047e0d0dc66e8dcc306dfd31f v: v3 --- [refs] | 2 +- trunk/tools/perf/util/session.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9b60a1da6ac1..1f764a26f228 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9aefcab0de472ee2b3ab195a6827ddd4b170e3a7 +refs/heads/master: e4c2df132fef60a28b851abc1859a531e64f350c diff --git a/trunk/tools/perf/util/session.c b/trunk/tools/perf/util/session.c index 12761d5bc92a..a4339548de67 100644 --- a/trunk/tools/perf/util/session.c +++ b/trunk/tools/perf/util/session.c @@ -444,6 +444,7 @@ static event__swap_op event__swap_ops[] = { struct sample_queue { u64 timestamp; + u64 file_offset; event_t *event; struct list_head list; }; @@ -596,7 +597,7 @@ static void __queue_event(struct sample_queue *new, struct perf_session *s) #define MAX_SAMPLE_BUFFER (64 * 1024 / sizeof(struct sample_queue)) static int perf_session_queue_event(struct perf_session *s, event_t *event, - struct sample_data *data) + struct sample_data *data, u64 file_offset) { struct ordered_samples *os = &s->ordered_samples; struct list_head *sc = &os->sample_cache; @@ -628,6 +629,7 @@ static int perf_session_queue_event(struct perf_session *s, event_t *event, } new->timestamp = timestamp; + new->file_offset = file_offset; new->event = event; __queue_event(new, s); @@ -780,7 +782,8 @@ static int perf_session__process_event(struct perf_session *session, } if (ops->ordered_samples) { - ret = perf_session_queue_event(session, event, &sample); + ret = perf_session_queue_event(session, event, &sample, + file_offset); if (ret != -ETIME) return ret; }