2010-12-07 12:50:09

by Thomas Gleixner

Subject: [patch 4/9] perf: session: Store file offset in sample_queue

Preparatory patch for ordered output of perf report -D

Signed-off-by: Thomas Gleixner <[email protected]>
---
tools/perf/util/session.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

Index: linux-2.6-tip/tools/perf/util/session.c
===================================================================
--- linux-2.6-tip.orig/tools/perf/util/session.c
+++ linux-2.6-tip/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_
#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(stru
}

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(s
}

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;
}

2010-12-09 03:56:38

by Ian Munsie

Subject: Re: [patch 4/9] perf: session: Store file offset in sample_queue

Excerpts from Thomas Gleixner's message of Tue Dec 07 12:48:50 UTC 2010:
> Subject: [patch 4/9] perf: session: Store file offset in sample_queue

Looks the same as mine, so:

Acked-by: Ian Munsie <[email protected]>

2010-12-09 23:38:35

by Thomas Gleixner

Subject: [tip:perf/core] perf session: Store file offset in sample_queue

Commit-ID: e4c2df132fef60a28b851abc1859a531e64f350c
Gitweb: http://git.kernel.org/tip/e4c2df132fef60a28b851abc1859a531e64f350c
Author: Thomas Gleixner <[email protected]>
AuthorDate: Tue, 7 Dec 2010 12:48:50 +0000
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 9 Dec 2010 12:09:18 -0200

perf session: Store file offset in sample_queue

Preparatory patch for ordered output of perf report -D.

Acked-by: Ian Munsie <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ian Munsie <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Peter Zijlstra <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/util/session.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 12761d5..a433954 100644
--- a/tools/perf/util/session.c
+++ b/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;
}