diff options
Diffstat (limited to 'tools/perf/scripts/python/Perf-Trace-Util')
| -rw-r--r-- | tools/perf/scripts/python/Perf-Trace-Util/Context.c | 20 | 
1 files changed, 1 insertions, 19 deletions
| diff --git a/tools/perf/scripts/python/Perf-Trace-Util/Context.c b/tools/perf/scripts/python/Perf-Trace-Util/Context.c index 01f54d6724a5..60dcfe56d4d9 100644 --- a/tools/perf/scripts/python/Perf-Trace-Util/Context.c +++ b/tools/perf/scripts/python/Perf-Trace-Util/Context.c @@ -24,16 +24,6 @@  #include "../../../util/srcline.h"  #include "../../../util/srccode.h" -#if PY_MAJOR_VERSION < 3 -#define _PyCapsule_GetPointer(arg1, arg2) \ -  PyCObject_AsVoidPtr(arg1) -#define _PyBytes_FromStringAndSize(arg1, arg2) \ -  PyString_FromStringAndSize((arg1), (arg2)) -#define _PyUnicode_AsUTF8(arg) \ -  PyString_AsString(arg) - -PyMODINIT_FUNC initperf_trace_context(void); -#else  #define _PyCapsule_GetPointer(arg1, arg2) \    PyCapsule_GetPointer((arg1), (arg2))  #define _PyBytes_FromStringAndSize(arg1, arg2) \ @@ -42,7 +32,6 @@ PyMODINIT_FUNC initperf_trace_context(void);    PyUnicode_AsUTF8(arg)  PyMODINIT_FUNC PyInit_perf_trace_context(void); -#endif  static struct scripting_context *get_args(PyObject *args, const char *name, PyObject **arg2)  { @@ -104,7 +93,7 @@ static PyObject *perf_sample_insn(PyObject *obj, PyObject *args)  	if (c->sample->ip && !c->sample->insn_len && thread__maps(c->al->thread)) {  		struct machine *machine =  maps__machine(thread__maps(c->al->thread)); -		script_fetch_insn(c->sample, c->al->thread, machine); +		script_fetch_insn(c->sample, c->al->thread, machine, /*native_arch=*/true);  	}  	if (!c->sample->insn_len)  		Py_RETURN_NONE; /* N.B. This is a return statement */ @@ -213,12 +202,6 @@ 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 = { @@ -240,4 +223,3 @@ PyMODINIT_FUNC PyInit_perf_trace_context(void)  	return mod;  } -#endif | 
