1 files changed, 88 insertions, 22 deletions

diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index b1e999bd21ef..863b61478edd 100644
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -12,6 +12,30 @@
 #include "print_binary.h"
 #include "thread_map.h"
 
+#if PY_MAJOR_VERSION < 3
+#define _PyUnicode_FromString(arg) \
+  PyString_FromString(arg)
+#define _PyUnicode_AsString(arg) \
+  PyString_AsString(arg)
+#define _PyUnicode_FromFormat(...) \
+  PyString_FromFormat(__VA_ARGS__)
+#define _PyLong_FromLong(arg) \
+  PyInt_FromLong(arg)
+
+#else
+
+#define _PyUnicode_FromString(arg) \
+  PyUnicode_FromString(arg)
+#define _PyUnicode_FromFormat(...) \
+  PyUnicode_FromFormat(__VA_ARGS__)
+#define _PyLong_FromLong(arg) \
+  PyLong_FromLong(arg)
+#endif
+
+#ifndef Py_TYPE
+#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
+#endif
+
 /*
  * Provide these two so that we don't have to link against callchain.c and
  * start dragging hist.c, etc.
@@ -49,7 +73,11 @@ int eprintf(int level, int var, const char *fmt, ...)
 # define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size,
 #endif
 
+#if PY_MAJOR_VERSION < 3
 PyMODINIT_FUNC initperf(void);
+#else
+PyMODINIT_FUNC PyInit_perf(void);
+#endif
 
 #define member_def(type, member, ptype, help) \
         { #member, ptype, \
@@ -107,7 +135,7 @@ static PyObject *pyrf_mmap_event__repr(struct pyrf_event *pevent)
                      pevent->event.mmap.pgoff, pevent->event.mmap.filename) < 0) {
                 ret = PyErr_NoMemory();
         } else {
-                ret = PyString_FromString(s);
+                ret = _PyUnicode_FromString(s);
                 free(s);
         }
         return ret;
@@ -138,7 +166,7 @@ static PyMemberDef pyrf_task_event__members[] = {
 
 static PyObject *pyrf_task_event__repr(struct pyrf_event *pevent)
 {
-        return PyString_FromFormat("{ type: %s, pid: %u, ppid: %u, tid: %u, "
+        return _PyUnicode_FromFormat("{ type: %s, pid: %u, ppid: %u, tid: %u, "
                                    "ptid: %u, time: %" PRIu64 "}",
                                    pevent->event.header.type == PERF_RECORD_FORK ? "fork" : "exit",
                                    pevent->event.fork.pid,
@@ -171,7 +199,7 @@ static PyMemberDef pyrf_comm_event__members[] = {
 
 static PyObject *pyrf_comm_event__repr(struct pyrf_event *pevent)
 {
-        return PyString_FromFormat("{ type: comm, pid: %u, tid: %u, comm: %s }",
+        return _PyUnicode_FromFormat("{ type: comm, pid: %u, tid: %u, comm: %s }",
                                    pevent->event.comm.pid,
                                    pevent->event.comm.tid,
                                    pevent->event.comm.comm);
@@ -202,7 +230,7 @@ static PyObject *pyrf_throttle_event__repr(struct pyrf_event *pevent)
 {
         struct throttle_event *te = (struct throttle_event *)(&pevent->event.header + 1);
 
-        return PyString_FromFormat("{ type: %sthrottle, time: %" PRIu64 ", id: %" PRIu64
+        return _PyUnicode_FromFormat("{ type: %sthrottle, time: %" PRIu64 ", id: %" PRIu64
                                    ", stream_id: %" PRIu64 " }",
                                    pevent->event.header.type == PERF_RECORD_THROTTLE ? "" : "un",
                                    te->time, te->id, te->stream_id);
@@ -237,7 +265,7 @@ static PyObject *pyrf_lost_event__repr(struct pyrf_event *pevent)
                      pevent->event.lost.id, pevent->event.lost.lost) < 0) {
                 ret = PyErr_NoMemory();
         } else {
-                ret = PyString_FromString(s);
+                ret = _PyUnicode_FromString(s);
                 free(s);
         }
         return ret;
@@ -264,7 +292,7 @@ static PyMemberDef pyrf_read_event__members[] = {
 
 static PyObject *pyrf_read_event__repr(struct pyrf_event *pevent)
 {
-        return PyString_FromFormat("{ type: read, pid: %u, tid: %u }",
+        return _PyUnicode_FromFormat("{ type: read, pid: %u, tid: %u }",
                                    pevent->event.read.pid,
                                    pevent->event.read.tid);
         /*
@@ -299,7 +327,7 @@ static PyObject *pyrf_sample_event__repr(struct pyrf_event *pevent)
         if (asprintf(&s, "{ type: sample }") < 0) {
                 ret = PyErr_NoMemory();
         } else {
-                ret = PyString_FromString(s);
+                ret = _PyUnicode_FromString(s);
                 free(s);
         }
         return ret;
@@ -330,7 +358,7 @@ tracepoint_field(struct pyrf_event *pe, struct format_field *field)
                 }
                 if (field->flags & FIELD_IS_STRING &&
                     is_printable_array(data + offset, len)) {
-                        ret = PyString_FromString((char *)data + offset);
+                        ret = _PyUnicode_FromString((char *)data + offset);
                 } else {
                         ret = PyByteArray_FromStringAndSize((const char *) data + offset, len);
                         field->flags &= ~FIELD_IS_STRING;
@@ -352,7 +380,7 @@ tracepoint_field(struct pyrf_event *pe, struct format_field *field)
 static PyObject*
 get_tracepoint_field(struct pyrf_event *pevent, PyObject *attr_name)
 {
-        const char *str = PyString_AsString(PyObject_Str(attr_name));
+        const char *str = _PyUnicode_AsString(PyObject_Str(attr_name));
         struct perf_evsel *evsel = pevent->evsel;
         struct format_field *field;
 
@@ -416,7 +444,7 @@ static PyObject *pyrf_context_switch_event__repr(struct pyrf_event *pevent)
                      !!(pevent->event.header.misc & PERF_RECORD_MISC_SWITCH_OUT)) < 0) {
                 ret = PyErr_NoMemory();
         } else {
-                ret = PyString_FromString(s);
+                ret = _PyUnicode_FromString(s);
                 free(s);
         }
         return ret;
@@ -528,7 +556,7 @@ static int pyrf_cpu_map__init(struct pyrf_cpu_map *pcpus,
 static void pyrf_cpu_map__delete(struct pyrf_cpu_map *pcpus)
 {
         cpu_map__put(pcpus->cpus);
-        pcpus->ob_type->tp_free((PyObject*)pcpus);
+        Py_TYPE(pcpus)->tp_free((PyObject*)pcpus);
 }
 
 static Py_ssize_t pyrf_cpu_map__length(PyObject *obj)
@@ -597,7 +625,7 @@ static int pyrf_thread_map__init(struct pyrf_thread_map *pthreads,
 static void pyrf_thread_map__delete(struct pyrf_thread_map *pthreads)
 {
         thread_map__put(pthreads->threads);
-        pthreads->ob_type->tp_free((PyObject*)pthreads);
+        Py_TYPE(pthreads)->tp_free((PyObject*)pthreads);
 }
 
 static Py_ssize_t pyrf_thread_map__length(PyObject *obj)
@@ -759,7 +787,7 @@ static int pyrf_evsel__init(struct pyrf_evsel *pevsel,
 static void pyrf_evsel__delete(struct pyrf_evsel *pevsel)
 {
         perf_evsel__exit(&pevsel->evsel);
-        pevsel->ob_type->tp_free((PyObject*)pevsel);
+        Py_TYPE(pevsel)->tp_free((PyObject*)pevsel);
 }
 
 static PyObject *pyrf_evsel__open(struct pyrf_evsel *pevsel,
@@ -850,7 +878,7 @@ static int pyrf_evlist__init(struct pyrf_evlist *pevlist,
 static void pyrf_evlist__delete(struct pyrf_evlist *pevlist)
 {
         perf_evlist__exit(&pevlist->evlist);
-        pevlist->ob_type->tp_free((PyObject*)pevlist);
+        Py_TYPE(pevlist)->tp_free((PyObject*)pevlist);
 }
 
 static PyObject *pyrf_evlist__mmap(struct pyrf_evlist *pevlist,
@@ -902,12 +930,16 @@ static PyObject *pyrf_evlist__get_pollfd(struct pyrf_evlist *pevlist,
 
         for (i = 0; i < evlist->pollfd.nr; ++i) {
                 PyObject *file;
+#if PY_MAJOR_VERSION < 3
                 FILE *fp = fdopen(evlist->pollfd.entries[i].fd, "r");
 
                 if (fp == NULL)
                         goto free_list;
 
                 file = PyFile_FromFile(fp, "perf", "r", NULL);
+#else
+                file = PyFile_FromFd(evlist->pollfd.entries[i].fd, "perf", "r", -1, NULL, NULL, NULL, 1);
+#endif
                 if (file == NULL)
                         goto free_list;
 
@@ -951,13 +983,18 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
         union perf_event *event;
         int sample_id_all = 1, cpu;
         static char *kwlist[] = { "cpu", "sample_id_all", NULL };
+        struct perf_mmap *md;
         int err;
 
         if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|i", kwlist,
                                          &cpu, &sample_id_all))
                 return NULL;
 
-        event = perf_evlist__mmap_read(evlist, cpu);
+        md = &evlist->mmap[cpu];
+        if (perf_mmap__read_init(md) < 0)
+                goto end;
+
+        event = perf_mmap__read_event(md);
         if (event != NULL) {
                 PyObject *pyevent = pyrf_event__new(event);
                 struct pyrf_event *pevent = (struct pyrf_event *)pyevent;
@@ -967,22 +1004,24 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
                         return PyErr_NoMemory();
 
                 evsel = perf_evlist__event2evsel(evlist, event);
-                if (!evsel)
+                if (!evsel) {
+                        Py_INCREF(Py_None);
                         return Py_None;
+                }
 
                 pevent->evsel = evsel;
 
                 err = perf_evsel__parse_sample(evsel, event, &pevent->sample);
 
                 /* Consume the even only after we parsed it out. */
-                perf_evlist__mmap_consume(evlist, cpu);
+                perf_mmap__consume(md);
 
                 if (err)
                         return PyErr_Format(PyExc_OSError,
                                             "perf: can't parse sample, err=%d", err);
                 return pyevent;
         }
-
+end:
         Py_INCREF(Py_None);
         return Py_None;
 }
@@ -1194,9 +1233,9 @@ static PyObject *pyrf__tracepoint(struct pyrf_evsel *pevsel,
 
         tp_format = trace_event__tp_format(sys, name);
         if (IS_ERR(tp_format))
-                return PyInt_FromLong(-1);
+                return _PyLong_FromLong(-1);
 
-        return PyInt_FromLong(tp_format->id);
+        return _PyLong_FromLong(tp_format->id);
 }
 
 static PyMethodDef perf__methods[] = {
@@ -1209,11 +1248,31 @@ static PyMethodDef perf__methods[] = {
         { .ml_name = NULL, }
 };
 
+#if PY_MAJOR_VERSION < 3
 PyMODINIT_FUNC initperf(void)
+#else
+PyMODINIT_FUNC PyInit_perf(void)
+#endif
 {
         PyObject *obj;
         int i;
-        PyObject *dict, *module = Py_InitModule("perf", perf__methods);
+        PyObject *dict;
+#if PY_MAJOR_VERSION < 3
+        PyObject *module = Py_InitModule("perf", perf__methods);
+#else
+        static struct PyModuleDef moduledef = {
+                PyModuleDef_HEAD_INIT,
+                "perf",                 /* m_name */
+                "",                     /* m_doc */
+                -1,                     /* m_size */
+                perf__methods,          /* m_methods */
+                NULL,                   /* m_reload */
+                NULL,                   /* m_traverse */
+                NULL,                   /* m_clear */
+                NULL,                   /* m_free */
+        };
+        PyObject *module = PyModule_Create(&moduledef);
+#endif
 
         if (module == NULL ||
             pyrf_event__setup_types() < 0 ||
@@ -1221,7 +1280,11 @@ PyMODINIT_FUNC initperf(void)
             pyrf_evsel__setup_types() < 0 ||
             pyrf_thread_map__setup_types() < 0 ||
             pyrf_cpu_map__setup_types() < 0)
+#if PY_MAJOR_VERSION < 3
                 return;
+#else
+                return module;
+#endif
 
         /* The page_size is placed in util object. */
         page_size = sysconf(_SC_PAGE_SIZE);
@@ -1270,7 +1333,7 @@ PyMODINIT_FUNC initperf(void)
                 goto error;
 
         for (i = 0; perf__constants[i].name != NULL; i++) {
-                obj = PyInt_FromLong(perf__constants[i].value);
+                obj = _PyLong_FromLong(perf__constants[i].value);
                 if (obj == NULL)
                         goto error;
                 PyDict_SetItemString(dict, perf__constants[i].name, obj);
@@ -1280,6 +1343,9 @@ PyMODINIT_FUNC initperf(void)
 error:
         if (PyErr_Occurred())
                 PyErr_SetString(PyExc_ImportError, "perf: Init failed!");
+#if PY_MAJOR_VERSION >= 3
+        return module;
+#endif
 }
 
 /*