Skip to content

Commit a4a6668

Browse files
olsajiriacmel
authored andcommitted
perf ordered_events: Add private data member
We will need it in following patch, where we can't use the container_of() trick to get the higher level object. Signed-off-by: Jiri Olsa <[email protected]> Acked-by: David S. Miller <[email protected]> Acked-by: Namhyung Kim <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent b8494f1 commit a4a6668

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

tools/perf/util/ordered-events.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,14 +326,16 @@ int ordered_events__flush(struct ordered_events *oe, enum oe_flush how)
326326
return err;
327327
}
328328

329-
void ordered_events__init(struct ordered_events *oe, ordered_events__deliver_t deliver)
329+
void ordered_events__init(struct ordered_events *oe, ordered_events__deliver_t deliver,
330+
void *data)
330331
{
331332
INIT_LIST_HEAD(&oe->events);
332333
INIT_LIST_HEAD(&oe->cache);
333334
INIT_LIST_HEAD(&oe->to_free);
334335
oe->max_alloc_size = (u64) -1;
335336
oe->cur_alloc_size = 0;
336337
oe->deliver = deliver;
338+
oe->data = data;
337339
}
338340

339341
static void
@@ -377,5 +379,5 @@ void ordered_events__reinit(struct ordered_events *oe)
377379

378380
ordered_events__free(oe);
379381
memset(oe, '\0', sizeof(*oe));
380-
ordered_events__init(oe, old_deliver);
382+
ordered_events__init(oe, old_deliver, oe->data);
381383
}

tools/perf/util/ordered-events.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,15 @@ struct ordered_events {
4747
enum oe_flush last_flush_type;
4848
u32 nr_unordered_events;
4949
bool copy_on_queue;
50+
void *data;
5051
};
5152

5253
int ordered_events__queue(struct ordered_events *oe, union perf_event *event,
5354
u64 timestamp, u64 file_offset);
5455
void ordered_events__delete(struct ordered_events *oe, struct ordered_event *event);
5556
int ordered_events__flush(struct ordered_events *oe, enum oe_flush how);
56-
void ordered_events__init(struct ordered_events *oe, ordered_events__deliver_t deliver);
57+
void ordered_events__init(struct ordered_events *oe, ordered_events__deliver_t deliver,
58+
void *data);
5759
void ordered_events__free(struct ordered_events *oe);
5860
void ordered_events__reinit(struct ordered_events *oe);
5961

tools/perf/util/session.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ struct perf_session *perf_session__new(struct perf_data *data,
126126
session->tool = tool;
127127
INIT_LIST_HEAD(&session->auxtrace_index);
128128
machines__init(&session->machines);
129-
ordered_events__init(&session->ordered_events, ordered_events__deliver_event);
129+
ordered_events__init(&session->ordered_events,
130+
ordered_events__deliver_event, NULL);
130131

131132
if (data) {
132133
if (perf_data__open(data))

0 commit comments

Comments
 (0)