Something went wrong. Try again.
This repository has no description
Something went wrong. Try again.
21 kB · 616 lines
at main
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perfindex 262916f4..ef05d9d4 100644--- a/tools/perf/Makefile.perf+++ b/tools/perf/Makefile.perf@@ -155,7 +155,7 @@ PYTHON_EXTBUILD_LIB := $(PYTHON_EXTBUILD)lib/ PYTHON_EXTBUILD_TMP := $(PYTHON_EXTBUILD)tmp/ export PYTHON_EXTBUILD_LIB PYTHON_EXTBUILD_TMP -python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) $(OUTPUT)python/perf.so+python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) $(OUTPUT)python/perf*.so PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources) PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py $(LIBTRACEEVENT) $(LIBAPIKFS)@@ -164,7 +164,7 @@ $(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(QUIET_GEN)CFLAGS='$(CFLAGS)' $(PYTHON_WORD) util/setup.py \ --quiet build_ext; \ mkdir -p $(OUTPUT)python && \- cp $(PYTHON_EXTBUILD_LIB)perf.so $(OUTPUT)python/+ cp $(PYTHON_EXTBUILD_LIB)perf*.so $(OUTPUT)python/ # # No Perl scripts right now: #diff --git a/tools/perf/scripts/python/Perf-Trace-Util/Context.c b/tools/perf/scripts/python/Perf-Trace-Util/Context.cindex fcd1dd66..1a0d2775 100644--- a/tools/perf/scripts/python/Perf-Trace-Util/Context.c+++ b/tools/perf/scripts/python/Perf-Trace-Util/Context.c@@ -23,7 +23,17 @@ #include "../../../perf.h" #include "../../../util/trace-event.h" +#if PY_MAJOR_VERSION < 3+#define _PyCapsule_GetPointer(arg1, arg2) \+ PyCObject_AsVoidPtr(arg1)+ PyMODINIT_FUNC initperf_trace_context(void);+#else+#define _PyCapsule_GetPointer(arg1, arg2) \+ PyCapsule_GetPointer((arg1), (arg2))++PyMODINIT_FUNC PyInit_perf_trace_context(void);+#endif static PyObject *perf_trace_context_common_pc(PyObject *obj, PyObject *args) {@@ -34,7 +44,7 @@ static PyObject *perf_trace_context_common_pc(PyObject *obj, PyObject *args) if (!PyArg_ParseTuple(args, "O", &context)) return NULL; - scripting_context = PyCObject_AsVoidPtr(context);+ scripting_context = _PyCapsule_GetPointer(context, NULL); retval = common_pc(scripting_context); return Py_BuildValue("i", retval);@@ -50,7 +60,7 @@ static PyObject *perf_trace_context_common_flags(PyObject *obj, if (!PyArg_ParseTuple(args, "O", &context)) return NULL; - scripting_context = PyCObject_AsVoidPtr(context);+ scripting_context = _PyCapsule_GetPointer(context, NULL); retval = common_flags(scripting_context); return Py_BuildValue("i", retval);@@ -66,7 +76,7 @@ static PyObject *perf_trace_context_common_lock_depth(PyObject *obj, if (!PyArg_ParseTuple(args, "O", &context)) return NULL; - scripting_context = PyCObject_AsVoidPtr(context);+ scripting_context = _PyCapsule_GetPointer(context, NULL); retval = common_lock_depth(scripting_context); return Py_BuildValue("i", retval);@@ -82,7 +92,25 @@ static PyMethodDef ContextMethods[] = { { NULL, NULL, 0, NULL} }; +#if PY_MAJOR_VERSION < 3 PyMODINIT_FUNC initperf_trace_context(void) { (void) Py_InitModule("perf_trace_context", ContextMethods); }+#else+PyMODINIT_FUNC PyInit_perf_trace_context(void)+{+ static struct PyModuleDef moduledef = {+ PyModuleDef_HEAD_INIT,+ "perf_trace_context", /* m_name */+ "", /* m_doc */+ -1, /* m_size */+ ContextMethods, /* m_methods */+ NULL, /* m_reload */+ NULL, /* m_traverse */+ NULL, /* m_clear */+ NULL, /* m_free */+ };+ return PyModule_Create(&moduledef);+}+#endifdiff --git a/tools/perf/util/python.c b/tools/perf/util/python.cindex 3dda85ca..7e34376c 100644--- a/tools/perf/util/python.c+++ b/tools/perf/util/python.c@@ -8,6 +8,30 @@ #include "cpumap.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+ /* * Support debug printing even though util/debug.c is not linked. That means * implementing 'verbose' and 'eprintf'.@@ -33,7 +57,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, \@@ -89,7 +117,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;@@ -120,7 +148,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,@@ -153,7 +181,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);@@ -184,7 +212,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);@@ -219,7 +247,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;@@ -246,7 +274,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); /*@@ -281,7 +309,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;@@ -385,7 +413,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__delete(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)@@ -454,7 +482,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__delete(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)@@ -612,7 +640,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,@@ -703,7 +731,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,@@ -755,12 +783,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; @@ -1018,11 +1050,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 ||@@ -1030,7 +1082,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);@@ -1052,7 +1108,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);@@ -1062,6 +1118,9 @@ PyMODINIT_FUNC initperf(void) error: if (PyErr_Occurred()) PyErr_SetString(PyExc_ImportError, "perf: Init failed!");+#if PY_MAJOR_VERSION >= 3+ return module;+#endif } /*diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.cindex 496f21ca..1f4657d3 100644--- a/tools/perf/util/scripting-engines/trace-event-python.c+++ b/tools/perf/util/scripting-engines/trace-event-python.c@@ -36,7 +36,37 @@ #include "../trace-event.h" #include "../machine.h" +#if PY_MAJOR_VERSION < 3+#define _PyUnicode_FromString(arg) \+ PyString_FromString(arg)+#define _PyUnicode_FromStringAndSize(arg1, arg2) \+ PyString_FromStringAndSize((arg1), (arg2))+#define _PyBytes_FromStringAndSize(arg1, arg2) \+ PyString_FromStringAndSize((arg1), (arg2))+#define _PyLong_FromLong(arg) \+ PyInt_FromLong(arg)+#define _PyLong_AsLong(arg) \+ PyInt_AsLong(arg)+#define _PyCapsule_New(arg1, arg2, arg3) \+ PyCObject_FromVoidPtr((arg1), (arg2))+ PyMODINIT_FUNC initperf_trace_context(void);+#else+#define _PyUnicode_FromString(arg) \+ PyUnicode_FromString(arg)+#define _PyUnicode_FromStringAndSize(arg1, arg2) \+ PyUnicode_FromStringAndSize((arg1), (arg2))+#define _PyBytes_FromStringAndSize(arg1, arg2) \+ PyBytes_FromStringAndSize((arg1), (arg2))+#define _PyLong_FromLong(arg) \+ PyLong_FromLong(arg)+#define _PyLong_AsLong(arg) \+ PyLong_AsLong(arg)+#define _PyCapsule_New(arg1, arg2, arg3) \+ PyCapsule_New((arg1), (arg2), (arg3))++PyMODINIT_FUNC PyInit_perf_trace_context(void);+#endif #define FTRACE_MAX_EVENT \ ((1 << (sizeof(unsigned short) * 8)) - 1)@@ -123,10 +153,10 @@ static void define_value(enum print_arg_type field_type, value = eval_flag(field_value); - PyTuple_SetItem(t, n++, PyString_FromString(ev_name));- PyTuple_SetItem(t, n++, PyString_FromString(field_name));- PyTuple_SetItem(t, n++, PyInt_FromLong(value));- PyTuple_SetItem(t, n++, PyString_FromString(field_str));+ PyTuple_SetItem(t, n++, _PyUnicode_FromString(ev_name));+ PyTuple_SetItem(t, n++, _PyUnicode_FromString(field_name));+ PyTuple_SetItem(t, n++, _PyLong_FromLong(value));+ PyTuple_SetItem(t, n++, _PyUnicode_FromString(field_str)); try_call_object(handler_name, t); @@ -164,10 +194,10 @@ static void define_field(enum print_arg_type field_type, if (!t) Py_FatalError("couldn't create Python tuple"); - PyTuple_SetItem(t, n++, PyString_FromString(ev_name));- PyTuple_SetItem(t, n++, PyString_FromString(field_name));+ PyTuple_SetItem(t, n++, _PyUnicode_FromString(ev_name));+ PyTuple_SetItem(t, n++, _PyUnicode_FromString(field_name)); if (field_type == PRINT_FLAGS)- PyTuple_SetItem(t, n++, PyString_FromString(delim));+ PyTuple_SetItem(t, n++, _PyUnicode_FromString(delim)); try_call_object(handler_name, t); @@ -281,12 +311,12 @@ static PyObject *get_field_numeric_entry(struct event_format *event, if (field->flags & FIELD_IS_SIGNED) { if ((long long)val >= LONG_MIN && (long long)val <= LONG_MAX)- obj = PyInt_FromLong(val);+ obj = _PyLong_FromLong(val); else obj = PyLong_FromLongLong(val); } else { if (val <= LONG_MAX)- obj = PyInt_FromLong(val);+ obj = _PyLong_FromLong(val); else obj = PyLong_FromUnsignedLongLong(val); }@@ -345,9 +375,9 @@ static PyObject *python_process_callchain(struct perf_sample *sample, pydict_set_item_string_decref(pysym, "end", PyLong_FromUnsignedLongLong(node->sym->end)); pydict_set_item_string_decref(pysym, "binding",- PyInt_FromLong(node->sym->binding));+ _PyLong_FromLong(node->sym->binding)); pydict_set_item_string_decref(pysym, "name",- PyString_FromStringAndSize(node->sym->name,+ _PyUnicode_FromStringAndSize(node->sym->name, node->sym->namelen)); pydict_set_item_string_decref(pyelem, "sym", pysym); }@@ -362,7 +392,7 @@ static PyObject *python_process_callchain(struct perf_sample *sample, dsoname = map->dso->name; } pydict_set_item_string_decref(pyelem, "dso",- PyString_FromString(dsoname));+ _PyUnicode_FromString(dsoname)); } callchain_cursor_advance(&callchain_cursor);@@ -417,27 +447,27 @@ static void python_process_tracepoint(struct perf_sample *sample, scripting_context->event_data = data; scripting_context->pevent = evsel->tp_format->pevent; - context = PyCObject_FromVoidPtr(scripting_context, NULL);+ context = _PyCapsule_New(scripting_context, NULL, NULL); - PyTuple_SetItem(t, n++, PyString_FromString(handler_name));+ PyTuple_SetItem(t, n++, _PyUnicode_FromString(handler_name)); PyTuple_SetItem(t, n++, context); /* ip unwinding */ callchain = python_process_callchain(sample, evsel, al); if (handler) {- PyTuple_SetItem(t, n++, PyInt_FromLong(cpu));- PyTuple_SetItem(t, n++, PyInt_FromLong(s));- PyTuple_SetItem(t, n++, PyInt_FromLong(ns));- PyTuple_SetItem(t, n++, PyInt_FromLong(pid));- PyTuple_SetItem(t, n++, PyString_FromString(comm));+ PyTuple_SetItem(t, n++, _PyLong_FromLong(cpu));+ PyTuple_SetItem(t, n++, _PyLong_FromLong(s));+ PyTuple_SetItem(t, n++, _PyLong_FromLong(ns));+ PyTuple_SetItem(t, n++, _PyLong_FromLong(pid));+ PyTuple_SetItem(t, n++, _PyUnicode_FromString(comm)); PyTuple_SetItem(t, n++, callchain); } else {- pydict_set_item_string_decref(dict, "common_cpu", PyInt_FromLong(cpu));- pydict_set_item_string_decref(dict, "common_s", PyInt_FromLong(s));- pydict_set_item_string_decref(dict, "common_ns", PyInt_FromLong(ns));- pydict_set_item_string_decref(dict, "common_pid", PyInt_FromLong(pid));- pydict_set_item_string_decref(dict, "common_comm", PyString_FromString(comm));+ pydict_set_item_string_decref(dict, "common_cpu", _PyLong_FromLong(cpu));+ pydict_set_item_string_decref(dict, "common_s", _PyLong_FromLong(s));+ pydict_set_item_string_decref(dict, "common_ns", _PyLong_FromLong(ns));+ pydict_set_item_string_decref(dict, "common_pid", _PyLong_FromLong(pid));+ pydict_set_item_string_decref(dict, "common_comm", _PyUnicode_FromString(comm)); pydict_set_item_string_decref(dict, "common_callchain", callchain); } for (field = event->format.fields; field; field = field->next) {@@ -448,7 +478,7 @@ static void python_process_tracepoint(struct perf_sample *sample, offset &= 0xffff; } else offset = field->offset;- obj = PyString_FromString((char *)data + offset);+ obj = _PyUnicode_FromString((char *)data + offset); } else { /* FIELD_IS_NUMERIC */ obj = get_field_numeric_entry(event, field, data); }@@ -506,16 +536,16 @@ static void python_process_general_event(struct perf_sample *sample, if (!handler) goto exit; - pydict_set_item_string_decref(dict, "ev_name", PyString_FromString(perf_evsel__name(evsel)));- pydict_set_item_string_decref(dict, "attr", PyString_FromStringAndSize(+ pydict_set_item_string_decref(dict, "ev_name", _PyUnicode_FromString(perf_evsel__name(evsel)));+ pydict_set_item_string_decref(dict, "attr", _PyUnicode_FromStringAndSize( (const char *)&evsel->attr, sizeof(evsel->attr))); pydict_set_item_string_decref(dict_sample, "pid",- PyInt_FromLong(sample->pid));+ _PyLong_FromLong(sample->pid)); pydict_set_item_string_decref(dict_sample, "tid",- PyInt_FromLong(sample->tid));+ _PyLong_FromLong(sample->tid)); pydict_set_item_string_decref(dict_sample, "cpu",- PyInt_FromLong(sample->cpu));+ _PyLong_FromLong(sample->cpu)); pydict_set_item_string_decref(dict_sample, "ip", PyLong_FromUnsignedLongLong(sample->ip)); pydict_set_item_string_decref(dict_sample, "time",@@ -524,17 +554,17 @@ static void python_process_general_event(struct perf_sample *sample, PyLong_FromUnsignedLongLong(sample->period)); pydict_set_item_string_decref(dict, "sample", dict_sample); - pydict_set_item_string_decref(dict, "raw_buf", PyString_FromStringAndSize(+ pydict_set_item_string_decref(dict, "raw_buf", _PyBytes_FromStringAndSize( (const char *)sample->raw_data, sample->raw_size)); pydict_set_item_string_decref(dict, "comm",- PyString_FromString(thread__comm_str(thread)));+ _PyUnicode_FromString(thread__comm_str(thread))); if (al->map) { pydict_set_item_string_decref(dict, "dso",- PyString_FromString(al->map->dso->name));+ _PyUnicode_FromString(al->map->dso->name)); } if (al->sym) { pydict_set_item_string_decref(dict, "symbol",- PyString_FromString(al->sym->name));+ _PyUnicode_FromString(al->sym->name)); } /* ip unwinding */@@ -589,26 +619,56 @@ error: return -1; } +#if PY_MAJOR_VERSION < 3+static void _free_command_line(const char **command_line, int num)+{+ free(command_line);+}+#else+static void _free_command_line(wchar_t **command_line, int num)+{+ int i;+ for (i = 0; i < num; i++)+ PyMem_RawFree(command_line[i]);+ free(command_line);+}+#endif+ /* * Start trace script */ static int python_start_script(const char *script, int argc, const char **argv) {+#if PY_MAJOR_VERSION < 3 const char **command_line;+#else+ wchar_t **command_line;+#endif char buf[PATH_MAX]; int i, err = 0; FILE *fp; +#if PY_MAJOR_VERSION < 3 command_line = malloc((argc + 1) * sizeof(const char *)); command_line[0] = script; for (i = 1; i < argc + 1; i++) command_line[i] = argv[i - 1];+#else+ command_line = malloc((argc + 1) * sizeof(wchar_t *));+ command_line[0] = Py_DecodeLocale(script, NULL);+ for (i = 1; i < argc + 1; i++)+ command_line[i] = Py_DecodeLocale(argv[i - 1], NULL);+#endif Py_Initialize(); +#if PY_MAJOR_VERSION < 3 initperf_trace_context();- PySys_SetArgv(argc + 1, (char **)command_line);+#else+ PyInit_perf_trace_context();+ PySys_SetArgv(argc + 1, command_line);+#endif fp = fopen(script, "r"); if (!fp) {@@ -630,12 +690,12 @@ static int python_start_script(const char *script, int argc, const char **argv) goto error; } - free(command_line);+ _free_command_line(command_line, argc + 1); return err; error: Py_Finalize();- free(command_line);+ _free_command_line(command_line, argc + 1); return err; }diff --git a/tools/perf/util/setup.py b/tools/perf/util/setup.pyindex d0aee4b9..fc25b50d 100644--- a/tools/perf/util/setup.py+++ b/tools/perf/util/setup.py@@ -1,4 +1,4 @@-#!/usr/bin/python2+#!/usr/bin/python3 from distutils.core import setup, Extension from os import getenv@@ -27,7 +27,7 @@ build_tmp = getenv('PYTHON_EXTBUILD_TMP') libtraceevent = getenv('LIBTRACEEVENT') libapikfs = getenv('LIBAPIKFS') -ext_sources = [f.strip() for f in file('util/python-ext-sources')+ext_sources = [f.strip() for f in open('util/python-ext-sources') if len(f.strip()) > 0 and f[0] != '#'] perf = Extension('perf',