perf tools: Rename 'struct sample_data' to 'struct perf_sample'

Making the namespace more uniform.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 8879463807e4a06269e11e5594731ace4fd80ff2..ef367513541450e87ad3164ccf125df2ff2206aa 100644 (file)
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -58,7 +58,7 @@ static int hists__add_entry(struct hists *self, struct addr_location *al)
        return hist_entry__inc_addr_samples(he, al->addr);
 }
 
-static int process_sample_event(event_t *event, struct sample_data *sample,
+static int process_sample_event(event_t *event, struct perf_sample *sample,
                                struct perf_session *session)
 {
        struct addr_location al;

diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 3153e492dbcc29e1593b6df29357424dd012da99..0822149dc7683c590bc3aaadfb231421513fb840 100644 (file)
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -31,7 +31,7 @@ static int hists__add_entry(struct hists *self,
 }
 
 static int diff__process_sample_event(event_t *event,
-                                     struct sample_data *sample,
+                                     struct perf_sample *sample,
                                      struct perf_session *session)
 {
        struct addr_location al;

diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 0c78ffa7bf675f46c9e631d9fa8d51fbc71aded4..4c9388ce878c5c189623f2942f230bfc07045ba2 100644 (file)
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -36,13 +36,13 @@ static int event__repipe_synth(event_t *event,
        return 0;
 }
 
-static int event__repipe(event_t *event, struct sample_data *sample __used,
+static int event__repipe(event_t *event, struct perf_sample *sample __used,
                         struct perf_session *session)
 {
        return event__repipe_synth(event, session);
 }
 
-static int event__repipe_mmap(event_t *self, struct sample_data *sample,
+static int event__repipe_mmap(event_t *self, struct perf_sample *sample,
                              struct perf_session *session)
 {
        int err;
@@ -53,7 +53,7 @@ static int event__repipe_mmap(event_t *self, struct sample_data *sample,
        return err;
 }
 
-static int event__repipe_task(event_t *self, struct sample_data *sample,
+static int event__repipe_task(event_t *self, struct perf_sample *sample,
                              struct perf_session *session)
 {
        int err;
@@ -119,7 +119,7 @@ static int dso__inject_build_id(struct dso *self, struct perf_session *session)
        return 0;
 }
 
-static int event__inject_buildid(event_t *event, struct sample_data *sample,
+static int event__inject_buildid(event_t *event, struct perf_sample *sample,
                                 struct perf_session *session)
 {
        struct addr_location al;

diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index d97256d6598044fab9e9d092e190fd70bdca4d93..3c1cdcf2990285862075184efeed2de05518a58f 100644 (file)
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -304,7 +304,7 @@ process_raw_event(event_t *raw_event __used, void *data,
        }
 }
 
-static int process_sample_event(event_t *event, struct sample_data *sample,
+static int process_sample_event(event_t *event, struct perf_sample *sample,
                                struct perf_session *session)
 {
        struct thread *thread = perf_session__findnew(session, event->ip.pid);

diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index 2b36defc5d73dd447fbe20ffd2d357c77d2c2058..c3f512791344bb7ddda9d7713fd3e9d20062055a 100644 (file)
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -834,7 +834,7 @@ static void dump_info(void)
                die("Unknown type of information\n");
 }
 
-static int process_sample_event(event_t *self, struct sample_data *sample,
+static int process_sample_event(event_t *self, struct perf_sample *sample,
                                struct perf_session *s)
 {
        struct thread *thread = perf_session__findnew(s, sample->tid);

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index caf927978d929de4c3bcc5cb1dcb2730c15b355d..5d3e4b32072bca18ac6469e3ed74219f9d29adb8 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -101,7 +101,7 @@ static void write_output(void *buf, size_t size)
 }
 
 static int process_synthesized_event(event_t *event,
-                                    struct sample_data *sample __used,
+                                    struct perf_sample *sample __used,
                                     struct perf_session *self __used)
 {
        write_output(event, event->header.size);

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index f6a43493d1d0340ff3468a0f6c0d0e24b355f206..bbbadcc04097ad3979a56fc3644cd2119c091b8b 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -77,9 +77,9 @@ static struct hists *perf_session__hists_findnew(struct perf_session *self,
        return new;
 }
 
-static int perf_session__add_hist_entry(struct perf_session *self,
+static int perf_session__add_hist_entry(struct perf_session *session,
                                        struct addr_location *al,
-                                       struct sample_data *data)
+                                       struct perf_sample *sample)
 {
        struct symbol *parent = NULL;
        int err = 0;
@@ -87,28 +87,28 @@ static int perf_session__add_hist_entry(struct perf_session *self,
        struct hists *hists;
        struct perf_event_attr *attr;
 
-       if ((sort__has_parent || symbol_conf.use_callchain) && data->callchain) {
-               err = perf_session__resolve_callchain(self, al->thread,
-                                                     data->callchain, &parent);
+       if ((sort__has_parent || symbol_conf.use_callchain) && sample->callchain) {
+               err = perf_session__resolve_callchain(session, al->thread,
+                                                     sample->callchain, &parent);
                if (err)
                        return err;
        }
 
-       attr = perf_header__find_attr(data->id, &self->header);
+       attr = perf_header__find_attr(sample->id, &session->header);
        if (attr)
-               hists = perf_session__hists_findnew(self, data->id, attr->type, attr->config);
+               hists = perf_session__hists_findnew(session, sample->id, attr->type, attr->config);
        else
-               hists = perf_session__hists_findnew(self, data->id, 0, 0);
+               hists = perf_session__hists_findnew(session, sample->id, 0, 0);
        if (hists == NULL)
                return -ENOMEM;
 
-       he = __hists__add_entry(hists, al, parent, data->period);
+       he = __hists__add_entry(hists, al, parent, sample->period);
        if (he == NULL)
                return -ENOMEM;
 
        if (symbol_conf.use_callchain) {
-               err = callchain_append(he->callchain, &self->callchain_cursor,
-                                      data->period);
+               err = callchain_append(he->callchain, &session->callchain_cursor,
+                                      sample->period);
                if (err)
                        return err;
        }
@@ -124,32 +124,32 @@ static int perf_session__add_hist_entry(struct perf_session *self,
 }
 
 static int add_event_total(struct perf_session *session,
-                          struct sample_data *data,
+                          struct perf_sample *sample,
                           struct perf_event_attr *attr)
 {
        struct hists *hists;
 
        if (attr)
-               hists = perf_session__hists_findnew(session, data->id,
+               hists = perf_session__hists_findnew(session, sample->id,
                                                    attr->type, attr->config);
        else
-               hists = perf_session__hists_findnew(session, data->id, 0, 0);
+               hists = perf_session__hists_findnew(session, sample->id, 0, 0);
 
        if (!hists)
                return -ENOMEM;
 
-       hists->stats.total_period += data->period;
+       hists->stats.total_period += sample->period;
        /*
         * FIXME: add_event_total should be moved from here to
         * perf_session__process_event so that the proper hist is passed to
         * the event_op methods.
         */
        hists__inc_nr_events(hists, PERF_RECORD_SAMPLE);
-       session->hists.stats.total_period += data->period;
+       session->hists.stats.total_period += sample->period;
        return 0;
 }
 
-static int process_sample_event(event_t *event, struct sample_data *sample,
+static int process_sample_event(event_t *event, struct perf_sample *sample,
                                struct perf_session *session)
 {
        struct addr_location al;
@@ -179,7 +179,7 @@ static int process_sample_event(event_t *event, struct sample_data *sample,
        return 0;
 }
 
-static int process_read_event(event_t *event, struct sample_data *sample __used,
+static int process_read_event(event_t *event, struct perf_sample *sample __used,
                              struct perf_session *session __used)
 {
        struct perf_event_attr *attr;

diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 29acb894e035154432c708e1bf6ae7b7db5c2be1..ff993c8b175d2d5a6e4f1d0a4e8085670a8a8e57 100644 (file)
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1607,7 +1607,7 @@ process_raw_event(event_t *raw_event __used, struct perf_session *session,
                process_sched_migrate_task_event(data, session, event, cpu, timestamp, thread);
 }
 
-static int process_sample_event(event_t *event, struct sample_data *sample,
+static int process_sample_event(event_t *event, struct perf_sample *sample,
                                struct perf_session *session)
 {
        struct thread *thread;

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index b766c2a9ac975614a7507156b258519ec2a50d0a..5c4c809008afb3bc4a41809036d37d97821ef1a8 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -63,7 +63,7 @@ static int cleanup_scripting(void)
 
 static char const              *input_name = "perf.data";
 
-static int process_sample_event(event_t *event, struct sample_data *sample,
+static int process_sample_event(event_t *event, struct perf_sample *sample,
                                struct perf_session *session)
 {
        struct thread *thread = perf_session__findnew(session, event->ip.pid);

diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c
index 738830d298e8c0a993478ffec41edfa741d7fe5c..df62433a34a7dad1a128a910b03f28ef869aa256 100644 (file)
--- a/tools/perf/builtin-test.c
+++ b/tools/perf/builtin-test.c
@@ -550,7 +550,7 @@ static int test__basic_mmap(void)
                }
 
        while ((event = perf_evlist__read_on_cpu(evlist, 0)) != NULL) {
-               struct sample_data sample;
+               struct perf_sample sample;
 
                if (event->header.type != PERF_RECORD_SAMPLE) {
                        pr_debug("unexpected %s event\n",

diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index 746cf03cb05d86a2796c88fca27930ca6e0a8894..01cf0c3771a65aa19a7251fb149a6049d85b8c12 100644 (file)
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -276,21 +276,21 @@ static int cpus_cstate_state[MAX_CPUS];
 static u64 cpus_pstate_start_times[MAX_CPUS];
 static u64 cpus_pstate_state[MAX_CPUS];
 
-static int process_comm_event(event_t *event, struct sample_data *sample __used,
+static int process_comm_event(event_t *event, struct perf_sample *sample __used,
                              struct perf_session *session __used)
 {
        pid_set_comm(event->comm.tid, event->comm.comm);
        return 0;
 }
 
-static int process_fork_event(event_t *event, struct sample_data *sample __used,
+static int process_fork_event(event_t *event, struct perf_sample *sample __used,
                              struct perf_session *session __used)
 {
        pid_fork(event->fork.pid, event->fork.ppid, event->fork.time);
        return 0;
 }
 
-static int process_exit_event(event_t *event, struct sample_data *sample __used,
+static int process_exit_event(event_t *event, struct perf_sample *sample __used,
                              struct perf_session *session __used)
 {
        pid_exit(event->fork.pid, event->fork.time);
@@ -487,7 +487,7 @@ static void sched_switch(int cpu, u64 timestamp, struct trace_entry *te)
 
 
 static int process_sample_event(event_t *event __used,
-                               struct sample_data *sample,
+                               struct perf_sample *sample,
                                struct perf_session *session)
 {
        struct trace_entry *te;

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 7f92ab7696f7841579f5dec8f1247e74ba5ae9e4..d923127b41b610336e6675d47b1133c4212239a3 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -997,7 +997,7 @@ static int symbol_filter(struct map *map, struct symbol *sym)
 }
 
 static void event__process_sample(const event_t *self,
-                                 struct sample_data *sample,
+                                 struct perf_sample *sample,
                                  struct perf_session *session)
 {
        u64 ip = self->ip.ip;
@@ -1107,7 +1107,7 @@ static void event__process_sample(const event_t *self,
 
 static void perf_session__mmap_read_cpu(struct perf_session *self, int cpu)
 {
-       struct sample_data sample;
+       struct perf_sample sample;
        event_t *event;
 
        while ((event = perf_evlist__read_on_cpu(evsel_list, cpu)) != NULL) {

diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
index deffb8c960716213124b7fd36f56edf41bf8207d..b184a7fa0843e7ac39e7e1f139a32491c9f1aafb 100644 (file)
--- a/tools/perf/util/build-id.c
+++ b/tools/perf/util/build-id.c
@@ -15,7 +15,7 @@
 #include "debug.h"
 
 static int build_id__mark_dso_hit(event_t *event,
-                                 struct sample_data *sample __used,
+                                 struct perf_sample *sample __used,
                                  struct perf_session *session)
 {
        struct addr_location al;
@@ -37,7 +37,7 @@ static int build_id__mark_dso_hit(event_t *event,
        return 0;
 }
 
-static int event__exit_del_thread(event_t *self, struct sample_data *sample __used,
+static int event__exit_del_thread(event_t *self, struct perf_sample *sample __used,
                                  struct perf_session *session)
 {
        struct thread *thread = perf_session__findnew(session, self->fork.tid);

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index b9d4ac87f9f7439436d10f0bb75e9eb12f1ba3dd..5c886fbd50cee6e6f33c4d15ac8837ffecb23e31 100644 (file)
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -34,7 +34,7 @@ const char *event__get_event_name(unsigned int id)
        return event__name[id];
 }
 
-static struct sample_data synth_sample = {
+static struct perf_sample synth_sample = {
        .pid       = -1,
        .tid       = -1,
        .time      = -1,
@@ -440,7 +440,7 @@ static int thread__set_comm_adjust(struct thread *self, const char *comm,
        return 0;
 }
 
-int event__process_comm(event_t *self, struct sample_data *sample __used,
+int event__process_comm(event_t *self, struct perf_sample *sample __used,
                        struct perf_session *session)
 {
        struct thread *thread = perf_session__findnew(session, self->comm.tid);
@@ -456,7 +456,7 @@ int event__process_comm(event_t *self, struct sample_data *sample __used,
        return 0;
 }
 
-int event__process_lost(event_t *self, struct sample_data *sample __used,
+int event__process_lost(event_t *self, struct perf_sample *sample __used,
                        struct perf_session *session)
 {
        dump_printf(": id:%" PRIu64 ": lost:%" PRIu64 "\n",
@@ -567,7 +567,7 @@ out_problem:
        return -1;
 }
 
-int event__process_mmap(event_t *self, struct sample_data *sample __used,
+int event__process_mmap(event_t *self, struct perf_sample *sample __used,
                        struct perf_session *session)
 {
        struct machine *machine;
@@ -609,7 +609,7 @@ out_problem:
        return 0;
 }
 
-int event__process_task(event_t *self, struct sample_data *sample __used,
+int event__process_task(event_t *self, struct perf_sample *sample __used,
                        struct perf_session *session)
 {
        struct thread *thread = perf_session__findnew(session, self->fork.tid);
@@ -632,7 +632,7 @@ int event__process_task(event_t *self, struct sample_data *sample __used,
        return 0;
 }
 
-int event__process(event_t *event, struct sample_data *sample,
+int event__process(event_t *event, struct perf_sample *sample,
                   struct perf_session *session)
 {
        switch (event->header.type) {
@@ -757,7 +757,7 @@ static void dso__calc_col_width(struct dso *self, struct hists *hists)
 }
 
 int event__preprocess_sample(const event_t *self, struct perf_session *session,
-                            struct addr_location *al, struct sample_data *data,
+                            struct addr_location *al, struct perf_sample *sample,
                             symbol_filter_t filter)
 {
        u8 cpumode = self->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
@@ -788,7 +788,7 @@ int event__preprocess_sample(const event_t *self, struct perf_session *session,
                    al->map ? al->map->dso->long_name :
                        al->level == 'H' ? "[hypervisor]" : "<not found>");
        al->sym = NULL;
-       al->cpu = data->cpu;
+       al->cpu = sample->cpu;
 
        if (al->map) {
                if (symbol_conf.dso_list &&

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index d79e4edd82f96503b3b78f816d5983dd15ff291e..84fd71ffd619e7ab90906ca5161f125232f89918 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -61,7 +61,7 @@ struct sample_event {
        u64 array[];
 };
 
-struct sample_data {
+struct perf_sample {
        u64 ip;
        u32 pid, tid;
        u64 time;
@@ -138,7 +138,7 @@ struct perf_session;
 
 typedef int (*event__handler_synth_t)(event_t *event, 
                                      struct perf_session *session);
-typedef int (*event__handler_t)(event_t *event, struct sample_data *sample,
+typedef int (*event__handler_t)(event_t *event, struct perf_sample *sample,
                                struct perf_session *session);
 
 int event__synthesize_thread(pid_t pid, event__handler_t process,
@@ -154,25 +154,25 @@ int event__synthesize_modules(event__handler_t process,
                              struct perf_session *session,
                              struct machine *machine);
 
-int event__process_comm(event_t *self, struct sample_data *sample,
+int event__process_comm(event_t *event, struct perf_sample *sample,
                        struct perf_session *session);
-int event__process_lost(event_t *self, struct sample_data *sample,
+int event__process_lost(event_t *event, struct perf_sample *sample,
                        struct perf_session *session);
-int event__process_mmap(event_t *self, struct sample_data *sample,
+int event__process_mmap(event_t *event, struct perf_sample *sample,
                        struct perf_session *session);
-int event__process_task(event_t *self, struct sample_data *sample,
+int event__process_task(event_t *event, struct perf_sample *sample,
                        struct perf_session *session);
-int event__process(event_t *event, struct sample_data *sample,
+int event__process(event_t *event, struct perf_sample *sample,
                   struct perf_session *session);
 
 struct addr_location;
 int event__preprocess_sample(const event_t *self, struct perf_session *session,
-                            struct addr_location *al, struct sample_data *data,
+                            struct addr_location *al, struct perf_sample *sample,
                             symbol_filter_t filter);
 
 const char *event__get_event_name(unsigned int id);
 
 int event__parse_sample(const event_t *event, u64 type, bool sample_id_all,
-                       struct sample_data *sample);
+                       struct perf_sample *sample);
 
 #endif /* __PERF_RECORD_H */

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index f98b3e585039bbf926d8ea15fa01ab7b943387fe..a134885118803c2ec1747110245fec50c4639770 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -368,7 +368,7 @@ out_unmap:
 }
 
 static int event__parse_id_sample(const event_t *event, u64 type,
-                                 struct sample_data *sample)
+                                 struct perf_sample *sample)
 {
        const u64 *array = event->sample.array;
 
@@ -406,7 +406,7 @@ static int event__parse_id_sample(const event_t *event, u64 type,
 }
 
 int event__parse_sample(const event_t *event, u64 type, bool sample_id_all,
-                       struct sample_data *data)
+                       struct perf_sample *data)
 {
        const u64 *array;
 

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index e6a07408669ec27cba012bbf99b17f6bb50125cc..ee0b611025713dc3284c0466b5b7bf5721496ce8 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -67,7 +67,7 @@ out_close:
 
 static void perf_session__id_header_size(struct perf_session *session)
 {
-       struct sample_data *data;
+       struct perf_sample *data;
        u64 sample_type = session->sample_type;
        u16 size = 0;
 
@@ -299,7 +299,7 @@ static int process_event_synth_stub(event_t *event __used,
 }
 
 static int process_event_stub(event_t *event __used,
-                             struct sample_data *sample __used,
+                             struct perf_sample *sample __used,
                              struct perf_session *session __used)
 {
        dump_printf(": unhandled!\n");
@@ -475,7 +475,7 @@ static void perf_session_free_sample_buffers(struct perf_session *session)
 
 static int perf_session_deliver_event(struct perf_session *session,
                                      event_t *event,
-                                     struct sample_data *sample,
+                                     struct perf_sample *sample,
                                      struct perf_event_ops *ops,
                                      u64 file_offset);
 
@@ -485,7 +485,7 @@ static void flush_sample_queue(struct perf_session *s,
        struct ordered_samples *os = &s->ordered_samples;
        struct list_head *head = &os->samples;
        struct sample_queue *tmp, *iter;
-       struct sample_data sample;
+       struct perf_sample sample;
        u64 limit = os->next_flush;
        u64 last_ts = os->last_sample ? os->last_sample->timestamp : 0ULL;
 
@@ -610,11 +610,11 @@ 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, u64 file_offset)
+                                   struct perf_sample *sample, u64 file_offset)
 {
        struct ordered_samples *os = &s->ordered_samples;
        struct list_head *sc = &os->sample_cache;
-       u64 timestamp = data->time;
+       u64 timestamp = sample->time;
        struct sample_queue *new;
 
        if (!timestamp || timestamp == ~0ULL)
@@ -650,7 +650,7 @@ static int perf_session_queue_event(struct perf_session *s, event_t *event,
        return 0;
 }
 
-static void callchain__printf(struct sample_data *sample)
+static void callchain__printf(struct perf_sample *sample)
 {
        unsigned int i;
 
@@ -663,7 +663,7 @@ static void callchain__printf(struct sample_data *sample)
 
 static void perf_session__print_tstamp(struct perf_session *session,
                                       event_t *event,
-                                      struct sample_data *sample)
+                                      struct perf_sample *sample)
 {
        if (event->header.type != PERF_RECORD_SAMPLE &&
            !session->sample_id_all) {
@@ -679,7 +679,7 @@ static void perf_session__print_tstamp(struct perf_session *session,
 }
 
 static void dump_event(struct perf_session *session, event_t *event,
-                      u64 file_offset, struct sample_data *sample)
+                      u64 file_offset, struct perf_sample *sample)
 {
        if (!dump_trace)
                return;
@@ -697,7 +697,7 @@ static void dump_event(struct perf_session *session, event_t *event,
 }
 
 static void dump_sample(struct perf_session *session, event_t *event,
-                       struct sample_data *sample)
+                       struct perf_sample *sample)
 {
        if (!dump_trace)
                return;
@@ -712,7 +712,7 @@ static void dump_sample(struct perf_session *session, event_t *event,
 
 static int perf_session_deliver_event(struct perf_session *session,
                                      event_t *event,
-                                     struct sample_data *sample,
+                                     struct perf_sample *sample,
                                      struct perf_event_ops *ops,
                                      u64 file_offset)
 {
@@ -745,7 +745,7 @@ static int perf_session_deliver_event(struct perf_session *session,
 }
 
 static int perf_session__preprocess_sample(struct perf_session *session,
-                                          event_t *event, struct sample_data *sample)
+                                          event_t *event, struct perf_sample *sample)
 {
        if (event->header.type != PERF_RECORD_SAMPLE ||
            !(session->sample_type & PERF_SAMPLE_CALLCHAIN))
@@ -789,7 +789,7 @@ static int perf_session__process_event(struct perf_session *session,
                                       struct perf_event_ops *ops,
                                       u64 file_offset)
 {
-       struct sample_data sample;
+       struct perf_sample sample;
        int ret;
 
        if (session->header.needs_swap && event__swap_ops[event->header.type])

diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 78239767011e1b2d58255cb4e451d86d0d81a007..365bf533a396091dad13900b3eb1bb919e79e284 100644 (file)
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -57,7 +57,7 @@ struct perf_session {
 
 struct perf_event_ops;
 
-typedef int (*event_op)(event_t *self, struct sample_data *sample,
+typedef int (*event_op)(event_t *self, struct perf_sample *sample,
                        struct perf_session *session);
 typedef int (*event_synth_op)(event_t *self, struct perf_session *session);
 typedef int (*event_op2)(event_t *self, struct perf_session *session,
@@ -158,7 +158,7 @@ size_t perf_session__fprintf_nr_events(struct perf_session *self, FILE *fp)
 
 static inline int perf_session__parse_sample(struct perf_session *session,
                                             const event_t *event,
-                                            struct sample_data *sample)
+                                            struct perf_sample *sample)
 {
        return event__parse_sample(event, session->sample_type,
                                   session->sample_id_all, sample);