Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-rpi.git] / tools / perf / util / evsel.c

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 6022daa..ffdd94e 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -70,7 +70,7 @@ struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr, int idx)
        return evsel;
 }
 
-static struct event_format *event_format__new(const char *sys, const char *name)
+struct event_format *event_format__new(const char *sys, const char *name)
 {
        int fd, n;
        char *filename;
@@ -122,6 +122,9 @@ struct perf_evsel *perf_evsel__newtp(const char *sys, const char *name, int idx)
                                          PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD),
                };
 
+               if (asprintf(&evsel->name, "%s:%s", sys, name) < 0)
+                       goto out_free;
+
                evsel->tp_format = event_format__new(sys, name);
                if (evsel->tp_format == NULL)
                        goto out_free;
@@ -130,12 +133,12 @@ struct perf_evsel *perf_evsel__newtp(const char *sys, const char *name, int idx)
                attr.config = evsel->tp_format->id;
                attr.sample_period = 1;
                perf_evsel__init(evsel, &attr, idx);
-               evsel->name = evsel->tp_format->name;
        }
 
        return evsel;
 
 out_free:
+       free(evsel->name);
        free(evsel);
        return NULL;
 }
@@ -584,10 +587,8 @@ void perf_evsel__delete(struct perf_evsel *evsel)
        perf_evsel__exit(evsel);
        close_cgroup(evsel->cgrp);
        free(evsel->group_name);
-       if (evsel->tp_format && evsel->name == evsel->tp_format->name) {
-               evsel->name = NULL;
+       if (evsel->tp_format)
                pevent_free_format(evsel->tp_format);
-       }
        free(evsel->name);
        free(evsel);
 }
@@ -1103,7 +1104,7 @@ struct format_field *perf_evsel__field(struct perf_evsel *evsel, const char *nam
        return pevent_find_field(evsel->tp_format, name);
 }
 
-char *perf_evsel__strval(struct perf_evsel *evsel, struct perf_sample *sample,
+void *perf_evsel__rawptr(struct perf_evsel *evsel, struct perf_sample *sample,
                         const char *name)
 {
        struct format_field *field = perf_evsel__field(evsel, name);