6 files changed, 24 insertions, 25 deletions

diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c
index d909eb74a0eb..2ea5fe4cc940 100644
--- a/tools/perf/builtin-test.c
+++ b/tools/perf/builtin-test.c
@@ -478,7 +478,6 @@ static int test__basic_mmap(void)
         unsigned int nr_events[nsyscalls],
                      expected_nr_events[nsyscalls], i, j;
         struct perf_evsel *evsels[nsyscalls], *evsel;
-        int sample_size = __perf_evsel__sample_size(attr.sample_type);
 
         for (i = 0; i < nsyscalls; ++i) {
                 char name[64];
@@ -563,7 +562,8 @@ static int test__basic_mmap(void)
                         goto out_munmap;
                 }
 
-                err = perf_event__parse_sample(event, attr.sample_type, sample_size,
+                err = perf_event__parse_sample(event, attr.sample_type,
+                                               evsels[0]->sample_size,
                                                false, &sample, false);
                 if (err) {
                         pr_err("Can't parse sample, err = %d\n", err);
@@ -666,7 +666,7 @@ static int test__PERF_RECORD(void)
              found_libc_mmap = false,
              found_vdso_mmap = false,
              found_ld_mmap = false;
-        int err = -1, errs = 0, i, wakeups = 0, sample_size;
+        int err = -1, errs = 0, i, wakeups = 0;
         u32 cpu;
         int total_events = 0, nr_events[PERF_RECORD_MAX] = { 0, };
 
@@ -761,7 +761,6 @@ static int test__PERF_RECORD(void)
          * event.
          */
         sample_type = perf_evlist__sample_type(evlist);
-        sample_size = __perf_evsel__sample_size(sample_type);
 
         /*
          * Now that all is properly set up, enable the events, they will
@@ -789,7 +788,7 @@ static int test__PERF_RECORD(void)
                                         nr_events[type]++;
 
                                 err = perf_event__parse_sample(event, sample_type,
-                                                               sample_size, true,
+                                                               evsel->sample_size, true,
                                                                &sample, false);
                                 if (err < 0) {
                                         if (verbose)
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index e81771364867..8feec4011356 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -20,7 +20,7 @@
 #define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
 #define GROUP_FD(group_fd, cpu) (*(int *)xyarray__entry(group_fd, cpu, 0))
 
-int __perf_evsel__sample_size(u64 sample_type)
+static int __perf_evsel__sample_size(u64 sample_type)
 {
         u64 mask = sample_type & PERF_SAMPLE_MASK;
         int size = 0;
@@ -53,6 +53,7 @@ void perf_evsel__init(struct perf_evsel *evsel,
         evsel->attr        = *attr;
         INIT_LIST_HEAD(&evsel->node);
         hists__init(&evsel->hists);
+        evsel->sample_size = __perf_evsel__sample_size(attr->sample_type);
 }
 
 struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr, int idx)
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 67cc5033d192..894bd77d90cc 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -65,6 +65,7 @@ struct perf_evsel {
                 void            *func;
                 void            *data;
         } handler;
+        unsigned int            sample_size;
         bool                    supported;
 };
 
@@ -177,13 +178,6 @@ static inline int perf_evsel__read_scaled(struct perf_evsel *evsel,
         return __perf_evsel__read(evsel, ncpus, nthreads, true);
 }
 
-int __perf_evsel__sample_size(u64 sample_type);
-
-static inline int perf_evsel__sample_size(struct perf_evsel *evsel)
-{
-        return __perf_evsel__sample_size(evsel->attr.sample_type);
-}
-
 void hists__init(struct hists *hists);
 
 #endif /* __PERF_EVSEL_H */
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index e03b58a48424..b0d6f85e30f1 100644
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -806,7 +806,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
 
                 first = list_entry(evlist->entries.next, struct perf_evsel, node);
                 err = perf_event__parse_sample(event, first->attr.sample_type,
-                                               perf_evsel__sample_size(first),
+                                               first->sample_size,
                                                sample_id_all, &pevent->sample, false);
                 if (err)
                         return PyErr_Format(PyExc_OSError,
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 8e4f0755d2aa..b8da60d1ecb5 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -16,6 +16,19 @@
 #include "cpumap.h"
 #include "event-parse.h"
 
+int perf_session__parse_sample(struct perf_session *session,
+                               const union perf_event *event,
+                               struct perf_sample *sample)
+{
+        struct perf_evsel *first;
+        first = list_entry(session->evlist->entries.next, struct perf_evsel, node);
+
+        return perf_event__parse_sample(event, session->sample_type,
+                                        first->sample_size,
+                                        session->sample_id_all, sample,
+                                        session->header.needs_swap);
+}
+
 static int perf_session__open(struct perf_session *self, bool force)
 {
         struct stat input_stat;
@@ -83,7 +96,6 @@ out_close:
 void perf_session__update_sample_type(struct perf_session *self)
 {
         self->sample_type = perf_evlist__sample_type(self->evlist);
-        self->sample_size = __perf_evsel__sample_size(self->sample_type);
         self->sample_id_all = perf_evlist__sample_id_all(self->evlist);
         self->id_hdr_size = perf_evlist__id_hdr_size(self->evlist);
         self->host_machine.id_hdr_size = self->id_hdr_size;
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 7c435bde6eb0..4d549e28248f 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -42,7 +42,6 @@ struct perf_session {
          */
         struct hists            hists;
         u64                     sample_type;
-        int                     sample_size;
         int                     fd;
         bool                    fd_pipe;
         bool                    repipe;
@@ -130,15 +129,9 @@ size_t perf_session__fprintf_dsos_buildid(struct perf_session *self,
 
 size_t perf_session__fprintf_nr_events(struct perf_session *session, FILE *fp);
 
-static inline int perf_session__parse_sample(struct perf_session *session,
-                                             const union perf_event *event,
-                                             struct perf_sample *sample)
-{
-        return perf_event__parse_sample(event, session->sample_type,
-                                        session->sample_size,
-                                        session->sample_id_all, sample,
-                                        session->header.needs_swap);
-}
+int perf_session__parse_sample(struct perf_session *session,
+                               const union perf_event *event,
+                               struct perf_sample *sample);
 
 static inline int perf_session__synthesize_sample(struct perf_session *session,
                                                   union perf_event *event,