1 files changed, 12 insertions, 27 deletions
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index ce35015f2dc6..ffb93f424953 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -1,6 +1,7 @@
 #include "builtin.h"
 #include "perf.h"
+#include "util/evsel.h"
 #include "util/util.h"
 #include "util/cache.h"
 #include "util/symbol.h"
@@ -57,11 +58,6 @@ static unsigned long nr_allocs, nr_cross_allocs;
 #define PATH_SYS_NODE   "/sys/devices/system/node"
-struct perf_kmem {
-        struct perf_tool    tool;
-        struct perf_session *session;
-};
 static void init_cpunode_map(void)
 {
        FILE *fp;
@@ -283,16 +279,10 @@ static void process_free_event(void *data,
        s_alloc->alloc_cpu = -1;
 }
-static void process_raw_event(struct perf_tool *tool,
+static void process_raw_event(struct perf_evsel *evsel, void *data,
-                              union perf_event *raw_event __used, void *data,
                              int cpu, u64 timestamp, struct thread *thread)
 {
-        struct perf_kmem *kmem = container_of(tool, struct perf_kmem, tool);
+        struct event_format *event = evsel->tp_format;
-        struct event_format *event;
-        int type;
-        type = trace_parse_common_type(kmem->session->pevent, data);
-        event = pevent_find_event(kmem->session->pevent, type);
        if (!strcmp(event->name, "kmalloc") ||
            !strcmp(event->name, "kmem_cache_alloc")) {
@@ -313,10 +303,10 @@ static void process_raw_event(struct perf_tool *tool,
        }
 }
-static int process_sample_event(struct perf_tool *tool,
+static int process_sample_event(struct perf_tool *tool __used,
                                union perf_event *event,
                                struct perf_sample *sample,
-                                struct perf_evsel *evsel __used,
+                                struct perf_evsel *evsel,
                                struct machine *machine)
 {
        struct thread *thread = machine__findnew_thread(machine, event->ip.pid);
@@ -329,18 +319,16 @@ static int process_sample_event(struct perf_tool *tool,
        dump_printf(" ... thread: %s:%d\n", thread->comm, thread->pid);
-        process_raw_event(tool, event, sample->raw_data, sample->cpu,
+        process_raw_event(evsel, sample->raw_data, sample->cpu,
                          sample->time, thread);
        return 0;
 }
-static struct perf_kmem perf_kmem = {
+static struct perf_tool perf_kmem = {
-        .tool = {
+        .sample          = process_sample_event,
-                .sample                 = process_sample_event,
+        .comm            = perf_event__process_comm,
-                .comm                   = perf_event__process_comm,
+        .ordered_samples = true,
-                .ordered_samples        = true,
-        },
 };
 static double fragmentation(unsigned long n_req, unsigned long n_alloc)
@@ -497,13 +485,10 @@ static int __cmd_kmem(void)
        int err = -EINVAL;
        struct perf_session *session;
-        session = perf_session__new(input_name, O_RDONLY, 0, false,
+        session = perf_session__new(input_name, O_RDONLY, 0, false, &perf_kmem);
-                                    &perf_kmem.tool);
        if (session == NULL)
                return -ENOMEM;
-        perf_kmem.session = session;
        if (perf_session__create_kernel_maps(session) < 0)
                goto out_delete;
@@ -511,7 +496,7 @@ static int __cmd_kmem(void)
                goto out_delete;
        setup_pager();
-        err = perf_session__process_events(session, &perf_kmem.tool);
+        err = perf_session__process_events(session, &perf_kmem);
        if (err != 0)
                goto out_delete;
        sort_result();