These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / tools / perf / util / trace-event.c

diff --git a/kernel/tools/perf/util/trace-event.c b/kernel/tools/perf/util/trace-event.c
index 6322d37..802bb86 100644 (file)
--- a/kernel/tools/perf/util/trace-event.c
+++ b/kernel/tools/perf/util/trace-event.c
@@ -7,8 +7,11 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <linux/kernel.h>
+#include <linux/err.h>
 #include <traceevent/event-parse.h>
+#include <api/fs/tracing_path.h>
 #include "trace-event.h"
+#include "machine.h"
 #include "util.h"
 
 /*
@@ -19,6 +22,7 @@
  * there.
  */
 static struct trace_event tevent;
+static bool tevent_initialized;
 
 int trace_event__init(struct trace_event *t)
 {
@@ -32,12 +36,40 @@ int trace_event__init(struct trace_event *t)
        return pevent ? 0 : -1;
 }
 
+static int trace_event__init2(void)
+{
+       int be = traceevent_host_bigendian();
+       struct pevent *pevent;
+
+       if (trace_event__init(&tevent))
+               return -1;
+
+       pevent = tevent.pevent;
+       pevent_set_flag(pevent, PEVENT_NSEC_OUTPUT);
+       pevent_set_file_bigendian(pevent, be);
+       pevent_set_host_bigendian(pevent, be);
+       tevent_initialized = true;
+       return 0;
+}
+
+int trace_event__register_resolver(struct machine *machine,
+                                  pevent_func_resolver_t *func)
+{
+       if (!tevent_initialized && trace_event__init2())
+               return -1;
+
+       return pevent_set_function_resolver(tevent.pevent, func, machine);
+}
+
 void trace_event__cleanup(struct trace_event *t)
 {
        traceevent_unload_plugins(t->plugin_list, t->pevent);
        pevent_free(t->pevent);
 }
 
+/*
+ * Returns pointer with encoded error via <linux/err.h> interface.
+ */
 static struct event_format*
 tp_format(const char *sys, const char *name)
 {
@@ -46,12 +78,14 @@ tp_format(const char *sys, const char *name)
        char path[PATH_MAX];
        size_t size;
        char *data;
+       int err;
 
        scnprintf(path, PATH_MAX, "%s/%s/%s/format",
                  tracing_events_path, sys, name);
 
-       if (filename__read_str(path, &data, &size))
-               return NULL;
+       err = filename__read_str(path, &data, &size);
+       if (err)
+               return ERR_PTR(err);
 
        pevent_parse_format(pevent, &event, data, size, sys);
 
@@ -59,24 +93,14 @@ tp_format(const char *sys, const char *name)
        return event;
 }
 
+/*
+ * Returns pointer with encoded error via <linux/err.h> interface.
+ */
 struct event_format*
 trace_event__tp_format(const char *sys, const char *name)
 {
-       static bool initialized;
-
-       if (!initialized) {
-               int be = traceevent_host_bigendian();
-               struct pevent *pevent;
-
-               if (trace_event__init(&tevent))
-                       return NULL;
-
-               pevent = tevent.pevent;
-               pevent_set_flag(pevent, PEVENT_NSEC_OUTPUT);
-               pevent_set_file_bigendian(pevent, be);
-               pevent_set_host_bigendian(pevent, be);
-               initialized = true;
-       }
+       if (!tevent_initialized && trace_event__init2())
+               return ERR_PTR(-ENOMEM);
 
        return tp_format(sys, name);
 }