perf ordered_events: Pass timestamp arg in perf_session__queue_event

There's no need to pass whole sample data, because it's only timestamp
that is used.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-xd1hpoze3kgb1rb639o3vehb@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index 0c36f2ac6a0e0419a61306be7161ea9462b3aead..cd253db6917f9a09f4eb1cbd290b625f9634b9a8 100644 (file)
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -754,7 +754,7 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx,
                        return -1;
                }
 
-               err = perf_session__queue_event(kvm->session, event, &sample, 0);
+               err = perf_session__queue_event(kvm->session, event, sample.time, 0);
                /*
                 * FIXME: Here we can't consume the event, as perf_session__queue_event will
                 *        point to it, and it'll get possibly overwritten by the kernel.

diff --git a/tools/perf/util/ordered-events.c b/tools/perf/util/ordered-events.c
index 8e09fd2d842f492c9b47342deaab725ccfcdf01e..bad9e0296e9ab5dafa4c237fe2c0f1760b57fda1 100644 (file)
--- a/tools/perf/util/ordered-events.c
+++ b/tools/perf/util/ordered-events.c
@@ -157,9 +157,8 @@ void ordered_events__delete(struct ordered_events *oe, struct ordered_event *eve
 }
 
 int ordered_events__queue(struct ordered_events *oe, union perf_event *event,
-                         struct perf_sample *sample, u64 file_offset)
+                         u64 timestamp, u64 file_offset)
 {
-       u64 timestamp = sample->time;
        struct ordered_event *oevent;
 
        if (!timestamp || timestamp == ~0ULL)

diff --git a/tools/perf/util/ordered-events.h b/tools/perf/util/ordered-events.h
index 96e5292d88e2584ba0d78abd3b23a3f3b5237073..8c7a2948593e96a8c297559ae30f694fafeee21f 100644 (file)
--- a/tools/perf/util/ordered-events.h
+++ b/tools/perf/util/ordered-events.h
@@ -45,7 +45,7 @@ struct ordered_events {
 };
 
 int ordered_events__queue(struct ordered_events *oe, union perf_event *event,
-                         struct perf_sample *sample, u64 file_offset);
+                         u64 timestamp, u64 file_offset);
 void ordered_events__delete(struct ordered_events *oe, struct ordered_event *event);
 int ordered_events__flush(struct ordered_events *oe, enum oe_flush how);
 void ordered_events__init(struct ordered_events *oe, ordered_events__deliver_t deliver);

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 5c412310f26644236844dd59e114cc770e04b0d0..8976e417eab29e416b19876f849f85b85a1ccf38 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -873,9 +873,9 @@ static int process_finished_round(struct perf_tool *tool __maybe_unused,
 }
 
 int perf_session__queue_event(struct perf_session *s, union perf_event *event,
-                             struct perf_sample *sample, u64 file_offset)
+                             u64 timestamp, u64 file_offset)
 {
-       return ordered_events__queue(&s->ordered_events, event, sample, file_offset);
+       return ordered_events__queue(&s->ordered_events, event, timestamp, file_offset);
 }
 
 static void callchain__lbr_callstack_printf(struct perf_sample *sample)
@@ -1517,7 +1517,7 @@ static s64 perf_session__process_event(struct perf_session *session,
                return ret;
 
        if (tool->ordered_events) {
-               ret = perf_session__queue_event(session, event, &sample, file_offset);
+               ret = perf_session__queue_event(session, event, sample.time, file_offset);
                if (ret != -ETIME)
                        return ret;
        }

diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 80bc80de8362c08c363b39f63d8a6662a4714f12..5b1c32b3694a398ef8c2f7e0082051c9670f6731 100644 (file)
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -53,7 +53,7 @@ int perf_session__peek_event(struct perf_session *session, off_t file_offset,
 int perf_session__process_events(struct perf_session *session);
 
 int perf_session__queue_event(struct perf_session *s, union perf_event *event,
-                             struct perf_sample *sample, u64 file_offset);
+                             u64 timestamp, u64 file_offset);
 
 void perf_tool__fill_defaults(struct perf_tool *tool);