trace-cruncher: Use proper naming in common.h
PATCH 1/4 trace-cruncher: Use proper naming in common.h
PyTepEvent was the first Python type defined in the C extension module. A legacy from this first implementation can be found in the naming of some variables used by the type definition macros.
--- src/common.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
src/common.h +5 -5
@@ -54,27 +54,27 @@ static inline void no_free()#define STR (x) #x -#define MAKE_TYPE_STR (x) STR(traceevent.x) +#define MAKE_TYPE_STR (x) STR(trace.x) -#define MAKE_DIC_STR (x) STR(libtraceevent x object) +#define MAKE_DIC_STR (x) STR(libtrace x object)#define C_OBJECT_WRAPPER_DECLARE (c_type, py_type) \ typedef struct { \ PyObject_HEAD \ struct c_type *ptrObj; \ } py_type; \ -PyObject *py_type##_New(struct c_type *evt_ptr); \ +PyObject *py_type##_New(struct c_type *c_ptr); \ bool py_type##TypeInit(); \#define C_OBJECT_WRAPPER (c_type, py_type, ptr_free) \ static PyTypeObject py_type##Type = { \ PyVarObject_HEAD_INIT(NULL, 0) MAKE_TYPE_STR(c_type) \ }; \ -PyObject *py_type##_New(struct c_type *evt_ptr) \ +PyObject *py_type##_New(struct c_type *c_ptr) \ { \ py_type *newObject; \ newObject = PyObject_New(py_type, &py_type##Type); \ - newObject->ptrObj = evt_ptr; \ + newObject->ptrObj = c_ptr; \ return (PyObject *) newObject; \ } \ static int py_type##_init(py_type *self, PyObject *args, PyObject *kwargs) \
Signature · 1 line
2.30.2
PATCH 2/4 trace-cruncher: Add type checking for the custom Python types
The new method checks if an object has a Python type that matches the type defined in the C extension module.
--- src/common.h | 5 +++++ 1 file changed, 5 insertions(+)
src/common.h +5 -0
@@ -65,6 +65,7 @@ static inline void no_free() } py_type; \ PyObject *py_type##_New(struct c_type *c_ptr); \ bool py_type##TypeInit(); \ +bool py_type##_Check(PyObject *obj); \#define C_OBJECT_WRAPPER (c_type, py_type, ptr_free) \ static PyTypeObject py_type##Type = { \
@@ -101,5 +102,9 @@ bool py_type##TypeInit() \ Py_INCREF(&py_type##Type); \ return true; \ } \ +bool py_type##_Check(PyObject *obj) \ +{ \ + return (obj->ob_type == &py_type##Type) ? true : false; \ +} \#endif
Signature · 1 line
2.30.2
PATCH 3/4 trace-cruncher: Define Python type for instances
In reply to Yordan Karadzhov (VMware)We add a custom Python type that wraps the 'tracefs_instance' object, defined in libtracefs. This is a preparation for a general refactorung of the way libtracefs instances are handled by trace-cruncher.
--- src/ftracepy-utils.c | 5 +++++ src/ftracepy-utils.h | 4 ++++ src/ftracepy.c | 15 +++++++++++++++ 3 files changed, 24 insertions(+)
src/ftracepy-utils.c +5 -0
@@ -531,6 +531,11 @@ bool get_instance_from_arg(PyObject *args, PyObject *kwargs,return true; } +PyObject *PyTfsInstance_dir (PyTfsInstance *self) +{ +return PyUnicode_FromString (tracefs_instance_get_dir (self->ptrObj)); +} +PyObject *PyFtrace_dir (PyObject *self) {return PyUnicode_FromString (tracefs_tracing_dir ());
src/ftracepy-utils.h +4 -0
@@ -22,6 +22,8 @@ C_OBJECT_WRAPPER_DECLARE(tep_event, PyTepEvent) C_OBJECT_WRAPPER_DECLARE(tep_handle, PyTep) +C_OBJECT_WRAPPER_DECLARE (tracefs_instance, PyTfsInstance) + PyObject *PyTepRecord_time(PyTepRecord* self);PyObject *PyTepRecord_cpu (PyTepRecord * self);
@@ -44,6 +46,8 @@ PyObject *PyTep_init_local(PyTep *self, PyObject *args,PyObject *PyTep_get_event (PyTep *self,PyObject *args,PyObject *kwargs); +PyObject *PyTfsInstance_dir (PyTfsInstance *self); +PyObject *PyFtrace_dir (PyObject *self); PyObject *PyFtrace_create_instance(PyObject *self, PyObject *args,
src/ftracepy.c +15 -0
@@ -73,6 +73,17 @@ static PyMethodDef PyTep_methods[] = { C_OBJECT_WRAPPER(tep_handle, PyTep, tep_free) +static PyMethodDef PyTfsInstance_methods[] = { + {"dir" , + (PyCFunction ) PyTfsInstance_dir, +METH_NOARGS , +"Get the absolute path to the instance directory." + }, + {NULL ,NULL ,0 ,NULL } +}; + +C_OBJECT_WRAPPER(tracefs_instance, PyTfsInstance, tracefs_instance_destroy) +static PyMethodDef ftracepy_methods[] = { {"dir" , (PyCFunction ) PyFtrace_dir,
@@ -321,6 +332,9 @@ PyMODINIT_FUNC PyInit_ftracepy(void)if (!PyTepRecordTypeInit ())return NULL ; +if (!PyTfsInstanceTypeInit ()) +return NULL ; +TFS_ERROR =PyErr_NewException ("tracecruncher.ftracepy.tfs_error" ,NULL ,NULL );
@@ -335,6 +349,7 @@ PyMODINIT_FUNC PyInit_ftracepy(void)PyModule_AddObject (module,"tep_handle" , (PyObject *) &PyTepType);PyModule_AddObject (module,"tep_event" , (PyObject *) &PyTepEventType);PyModule_AddObject (module,"tep_record" , (PyObject *) &PyTepRecordType); +PyModule_AddObject (module,"tracefs_instance" , (PyObject *) &PyTfsInstanceType);PyModule_AddObject (module,"tfs_error" ,TFS_ERROR );PyModule_AddObject (module,"tep_error" ,TEP_ERROR );
Signature · 1 line
2.30.2
PATCH 4/4 trace-cruncher: Refactor the way libtracefs instances are handled
In reply to Yordan Karadzhov (VMware)Currently all libtracefs instances created by trace-cruncher are wrapped by a dedicated C structure and stored in a binary search tree. The ordering in the tree is based on a string comparison. The tree is used for accessing the created instances and for cleanup when the module exits (garbage collection). In this refactoring we eliminate the need of the tree by switching to using the custom Python type for libtracefs instances. The new type is defined in the C extension of the module.
--- src/ftracepy-utils.c | 412 +++++------------- src/ftracepy-utils.h | 10 - src/ftracepy.c | 20 - tests/1_unit/test_01_ftracepy_unit.py | 245 +++++------ .../test_01_ftracepy_integration.py | 56 +-- 5 files changed, 242 insertions(+), 501 deletions(-)
src/ftracepy-utils.c +121 -291
@@ -19,7 +19,6 @@// trace-cruncher #include "ftracepy-utils.h" -static void *instance_root;PyObject *TFS_ERROR ;PyObject *TEP_ERROR ;PyObject *TRACECRUNCHER_ERROR ;
@@ -419,118 +418,6 @@ static PyObject *tfs_list2py_list(char **list)return py_list; } -struct instance_wrapper { -struct tracefs_instance *ptr; -const char *name; -}; - -const char *instance_wrapper_get_name (const struct instance_wrapper *iw) -{ -if (!iw->ptr) -return iw->name; - -return tracefs_instance_get_name (iw->ptr); -} - -static int instance_compare (const void *a,const void *b) -{ -const struct instance_wrapper *iwa, *iwb; - - iwa = (const struct instance_wrapper *) a; - iwb = (const struct instance_wrapper *) b; - -return strcmp (instance_wrapper_get_name (iwa), -instance_wrapper_get_name (iwb)); -} - -void instance_wrapper_free (void *ptr) -{ -struct instance_wrapper *iw; -if (!ptr) -return ; - - iw = ptr; -if (iw->ptr) { -if (tracefs_instance_destroy (iw->ptr) <0 ) -fprintf (stderr, -"\ntfs_error: Failed to destroy instance '%s'.\n" , -get_instance_name (iw->ptr)); - -free (iw->ptr); - } - -free (ptr); -} - -static void destroy_all_instances (void ) -{ -tdestroy (instance_root, instance_wrapper_free); - instance_root =NULL ; -} - -static struct tracefs_instance *find_instance (const char *name) -{ -struct instance_wrapper iw, **iw_ptr; -if (!is_set (name)) -return NULL ; - -if (!tracefs_instance_exists (name)) { -PyErr_Format (TFS_ERROR ,"Trace instance \'%s\' does not exist." , - name); -return NULL ; - } - - iw.ptr =NULL ; - iw.name = name; - iw_ptr =tfind (&iw, &instance_root, instance_compare); -if (!iw_ptr || !(*iw_ptr) || !(*iw_ptr)->ptr || -strcmp (tracefs_instance_get_name ((*iw_ptr)->ptr), name) !=0 ) { -PyErr_Format (TFS_ERROR ,"Unable to find trace instances \'%s\'." , - name); -return NULL ; - } - -return (*iw_ptr)->ptr; -} - -bool get_optional_instance (const char *instance_name, -struct tracefs_instance **instance) -{ - *instance =NULL ; -if (is_set (instance_name)) { - *instance =find_instance (instance_name); -if (!instance) { -PyErr_Format (TFS_ERROR , -"Failed to find instance \'%s\'." , - instance_name); -return false; - } - } - -return true; -} - -bool get_instance_from_arg (PyObject *args,PyObject *kwargs, -struct tracefs_instance **instance) -{ -const char *instance_name; - -static char *kwlist[] = {"instance" ,NULL }; - instance_name =NO_ARG ; -if (!PyArg_ParseTupleAndKeywords (args, - kwargs, -"|s" , - kwlist, - &instance_name)) { -return false; - } - -if (!get_optional_instance (instance_name, instance)) -return false; - -return true; -} -PyObject *PyTfsInstance_dir (PyTfsInstance *self) {return PyUnicode_FromString (tracefs_instance_get_dir (self->ptrObj));
@@ -570,7 +457,6 @@ static bool tracing_OFF(struct tracefs_instance *instance);PyObject *PyFtrace_create_instance (PyObject *self,PyObject *args,PyObject *kwargs) { -struct instance_wrapper *iw, **iw_ptr;struct tracefs_instance *instance;const char *name =NO_ARG ;int tracing_on = true;
@@ -598,115 +484,53 @@ PyObject *PyFtrace_create_instance(PyObject *self, PyObject *args,return NULL ; } - iw =calloc (1 ,sizeof (*iw)); -if (!iw) { -MEM_ERROR - return NULL; - } - - iw->ptr = instance; - iw_ptr =tsearch (iw, &instance_root, instance_compare); -if (!iw_ptr || !(*iw_ptr) || !(*iw_ptr)->ptr || -strcmp (tracefs_instance_get_name ((*iw_ptr)->ptr), name) !=0 ) { -PyErr_Format (TFS_ERROR , -"Failed to store new trace instance \'%s\'." , - name); -tracefs_instance_destroy (instance); -tracefs_instance_free (instance); -free (iw); - -return NULL ; - } -if (!tracing_on)tracing_OFF (instance); -return PyUnicode_FromString (name); +return PyTfsInstance_New (instance); } -PyObject *PyFtrace_destroy_instance (PyObject *self,PyObject *args, -PyObject *kwargs) +static bool get_optional_instance (PyObject *py_obj, +struct tracefs_instance **instance) { -struct tracefs_instance *instance; -struct instance_wrapper iw; -char *name; +PyTfsInstance *py_inst; -static char *kwlist[] = {"name" ,NULL }; -if (!PyArg_ParseTupleAndKeywords (args, - kwargs, -"s" , - kwlist, - &name)) { -return NULL ; - } - -if (is_all (name)) { -destroy_all_instances (); - Py_RETURN_NONE; +if (!py_obj) { + *instance =NULL ; +return true; } - instance =find_instance (name); -if (!instance) { -PyErr_Format (TFS_ERROR , -"Unable to destroy trace instances \'%s\'." , - name); -return NULL ; +if (!PyTfsInstance_Check (py_obj)) { +PyErr_SetString (TRACECRUNCHER_ERROR , +"Passing argument \'instance\' with incompatible type." ); +return false; } - iw.ptr =NULL ; - iw.name = name; -tdelete (&iw, &instance_root, instance_compare); - -tracefs_instance_destroy (instance); -tracefs_instance_free (instance); + py_inst = (PyTfsInstance *)py_obj; + *instance = py_inst->ptrObj; - Py_RETURN_NONE; +return true; } -PyObject *instance_list; - -static void instance_action (const void *nodep,VISIT which,int depth) +bool get_instance_from_arg (PyObject *args,PyObject *kwargs, +struct tracefs_instance **instance) { -struct instance_wrapper *iw = *(struct instance_wrapper **) nodep; -const char *name; - -switch (which) { -case preorder: -case endorder: -break ; +static char *kwlist[] = {"instance" ,NULL }; +PyObject *py_inst =NULL ; + *instance =NULL ; -case postorder: -case leaf: - name =tracefs_instance_get_name (iw->ptr); -PyList_Append (instance_list,PyUnicode_FromString (name)); -break ; +if (!PyArg_ParseTupleAndKeywords (args, + kwargs, +"|O" , + kwlist, + &py_inst)) { +return false; } -} - -PyObject *PyFtrace_get_all_instances (PyObject *self) -{ - instance_list =PyList_New (0 ); -twalk (instance_root, instance_action); - -return instance_list; -} - -PyObject *PyFtrace_destroy_all_instances (PyObject *self) -{ -destroy_all_instances (); - - Py_RETURN_NONE; -} - -PyObject *PyFtrace_instance_dir (PyObject *self,PyObject *args, -PyObject *kwargs) -{ -struct tracefs_instance *instance; -if (!get_instance_from_arg (args, kwargs, &instance)) +if (!get_optional_instance (py_inst, instance))return NULL ; -return PyUnicode_FromString (tracefs_instance_get_dir (instance)); +return true; } PyObject *PyFtrace_available_tracers(PyObject *self, PyObject *args,
@@ -728,21 +552,22 @@ PyObject *PyFtrace_available_tracers(PyObject *self, PyObject *args,PyObject *PyFtrace_set_current_tracer (PyObject *self,PyObject *args,PyObject *kwargs) { -const char *file ="current_tracer" , *tracer, *instance_name; +static char *kwlist[] = {"tracer" ,"instance" ,NULL }; +const char *file ="current_tracer" , *tracer;struct tracefs_instance *instance; +PyObject *py_inst =NULL ; -static char *kwlist[] = {"tracer" ,"instance" ,NULL }; - tracer = instance_name =NO_ARG ; + tracer =NO_ARG ;if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"|ss" , +"|sO" , kwlist, &tracer, - &instance_name)) { + &py_inst)) {return NULL ; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return NULL ; if (is_set(tracer) &&
@@ -816,20 +641,21 @@ PyObject *PyFtrace_available_system_events(PyObject *self, PyObject *args, PyObject *kwargs) {static char *kwlist[] = {"system" ,"instance" ,NULL }; -const char *instance_name =NO_ARG , *system;struct tracefs_instance *instance; +PyObject *py_inst =NULL ; +const char *system;char **list;if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"s|s" , +"s|O" , kwlist, &system, - &instance_name)) { + &py_inst)) {return NULL ; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return NULL ; list = tracefs_system_events(tracefs_instance_get_dir(instance),
@@ -927,21 +753,22 @@ static bool set_enable_event(PyObject *self, bool enable) {static char *kwlist[] = {"instance" ,"system" ,"event" ,NULL }; -const char *instance_name, *system, *event;struct tracefs_instance *instance; +PyObject *py_inst =NULL ; +const char *system, *event; - instance_name = system = event =NO_ARG ; + system = event =NO_ARG ;if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"|sss" , +"|Oss" , kwlist, - &instance_name, + &py_inst, &system, &event)) {return false; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return false;return event_enable_disable (instance, system, event, enable);
@@ -975,22 +802,21 @@ static bool set_enable_events(PyObject *self, PyObject *args, PyObject *kwargs,PyObject *system_list =NULL , *event_list =NULL , *system_event_list;const char **systems =NULL , **events =NULL ;struct tracefs_instance *instance; -const char *instance_name; +PyObject *py_inst =NULL ;char *file =NULL ;int ret, s, e; - instance_name =NO_ARG ;if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"|sOO" , +"|OOO" , kwlist, - &instance_name, + &py_inst, &system_list, &event_list)) {return false; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return false;if (!system_list && !event_list)
@@ -1102,21 +928,22 @@ PyObject *PyFtrace_event_is_enabled(PyObject *self, PyObject *args, PyObject *kwargs) {static char *kwlist[] = {"instance" ,"system" ,"event" ,NULL }; -const char *instance_name, *system, *event;struct tracefs_instance *instance; +PyObject *py_inst =NULL ; +const char *system, *event; - instance_name = system = event =NO_ARG ; + system = event =NO_ARG ;if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"|sss" , +"|Oss" , kwlist, - &instance_name, + &py_inst, &system, &event)) {return false; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return false;return event_is_enabled (instance, system, event);
@@ -1125,23 +952,24 @@ PyObject *PyFtrace_event_is_enabled(PyObject *self, PyObject *args,PyObject *PyFtrace_set_event_filter (PyObject *self,PyObject *args,PyObject *kwargs) { -const char *instance_name =NO_ARG , *system, *event, *filter; +const char *system, *event, *filter;struct tracefs_instance *instance; +PyObject *py_inst =NULL ;char path[PATH_MAX ];static char *kwlist[] = {"system" ,"event" ,"filter" ,"instance" ,NULL };if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"sss|s" , +"ssO|)" , kwlist, &system, &event, &filter, - &instance_name)) { + &py_inst)) {return NULL ; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return NULL ;sprintf (path,"events/%s/%s/filter" , system, event);
@@ -1156,22 +984,23 @@ PyObject *PyFtrace_set_event_filter(PyObject *self, PyObject *args,PyObject *PyFtrace_clear_event_filter (PyObject *self,PyObject *args,PyObject *kwargs) { -const char *instance_name =NO_ARG , *system, *event;struct tracefs_instance *instance; +PyObject *py_inst =NULL ; +const char *system, *event;char path[PATH_MAX ];static char *kwlist[] = {"system" ,"event" ,"instance" ,NULL };if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"ss|s" , +"ss|O" , kwlist, &system, &event, - &instance_name)) { + &py_inst)) {return NULL ; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return NULL ;sprintf (path,"events/%s/%s/filter" , system, event);
@@ -1330,21 +1159,21 @@ static bool set_pid(struct tracefs_instance *instance,PyObject *PyFtrace_set_event_pid (PyObject *self,PyObject *args,PyObject *kwargs) { -const char *instance_name =NO_ARG ;struct tracefs_instance *instance; +PyObject *py_inst =NULL ;PyObject *pid_val;static char *kwlist[] = {"pid" ,"instance" ,NULL };if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"O|s" , +"O|O" , kwlist, &pid_val, - &instance_name)) { + &py_inst)) {return NULL ; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return NULL ;if (!set_pid (instance,"set_event_pid" , pid_val))
@@ -1356,21 +1185,21 @@ PyObject *PyFtrace_set_event_pid(PyObject *self, PyObject *args,PyObject *PyFtrace_set_ftrace_pid (PyObject *self,PyObject *args,PyObject *kwargs) { -const char *instance_name =NO_ARG ;struct tracefs_instance *instance; +PyObject *py_inst =NULL ;PyObject *pid_val;static char *kwlist[] = {"pid" ,"instance" ,NULL };if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"O|s" , +"O|O" , kwlist, &pid_val, - &instance_name)) { + &py_inst)) {return NULL ; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return NULL ;if (!set_pid (instance,"set_ftrace_pid" , pid_val))
@@ -1396,20 +1225,21 @@ static bool set_opt(struct tracefs_instance *instance,static PyObject *set_option_py_args (PyObject *args,PyObject *kwargs,const char *val) { -const char *instance_name =NO_ARG , *opt;struct tracefs_instance *instance; +PyObject *py_inst =NULL ; +const char *opt;static char *kwlist[] = {"option" ,"instance" ,NULL };if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"s|s" , +"s|O" , kwlist, &opt, - &instance_name)) { + &py_inst)) {return NULL ; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return NULL ;if (!set_opt (instance, opt, val))
@@ -1433,21 +1263,22 @@ PyObject *PyFtrace_disable_option(PyObject *self, PyObject *args,PyObject *PyFtrace_option_is_set (PyObject *self,PyObject *args,PyObject *kwargs) { -const char *instance_name =NO_ARG , *opt;struct tracefs_instance *instance; +PyObject *py_inst =NULL ;enum tracefs_option_id opt_id; +const char *opt;static char *kwlist[] = {"option" ,"instance" ,NULL };if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"s|s" , +"s|O" , kwlist, &opt, - &instance_name)) { + &py_inst)) {return NULL ; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return NULL ; opt_id =tracefs_option_id (opt);
@@ -1686,22 +1517,23 @@ PyObject *PyFtrace_registered_kprobes(PyObject *self)PyObject *PyFtrace_set_kprobe_filter (PyObject *self,PyObject *args,PyObject *kwargs) { -const char *instance_name =NO_ARG , *event, *filter;struct tracefs_instance *instance; +PyObject *py_inst =NULL ; +const char *event, *filter;char path[PATH_MAX ];static char *kwlist[] = {"event" ,"filter" ,"instance" ,NULL };if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"ss|s" , +"ss|O" , kwlist, &event, &filter, - &instance_name)) { + &py_inst)) {return NULL ; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return NULL ;sprintf (path,"events/%s/%s/filter" ,TC_SYS , event);
@@ -1716,21 +1548,22 @@ PyObject *PyFtrace_set_kprobe_filter(PyObject *self, PyObject *args,PyObject *PyFtrace_clear_kprobe_filter (PyObject *self,PyObject *args,PyObject *kwargs) { -const char *instance_name =NO_ARG , *event;struct tracefs_instance *instance; +PyObject *py_inst =NULL ;char path[PATH_MAX ]; +const char *event;static char *kwlist[] = {"event" ,"instance" ,NULL };if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"s|s" , +"s|O" , kwlist, &event, - &instance_name)) { + &py_inst)) {return NULL ; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return NULL ;sprintf (path,"events/%s/%s/filter" ,TC_SYS , event);
@@ -1747,19 +1580,19 @@ static bool enable_kprobe(PyObject *self, PyObject *args, PyObject *kwargs, {static char *kwlist[] = {"event" ,"instance" ,NULL };struct tracefs_instance *instance; -const char *instance_name, *event; +PyObject *py_inst =NULL ; +const char *event =NO_ARG ; - instance_name = event =NO_ARG ;if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"s|s" , +"s|O" , kwlist, &event, - &instance_name)) { + &py_inst)) {return false; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return false;return event_enable_disable (instance,TC_SYS , event, enable);
@@ -1788,19 +1621,19 @@ PyObject *PyFtrace_kprobe_is_enabled(PyObject *self, PyObject *args, {static char *kwlist[] = {"event" ,"instance" ,NULL };struct tracefs_instance *instance; -const char *instance_name, *event; +PyObject *py_inst =NULL ; +const char *event =NO_ARG ; - instance_name = event =NO_ARG ;if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"s|s" , +"s|O" , kwlist, &event, - &instance_name)) { + &py_inst)) {return NULL ; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return NULL ;return event_is_enabled (instance,TC_SYS , event);
@@ -2003,27 +1836,27 @@ static bool init_callback_tep(struct tracefs_instance *instance,PyObject *PyFtrace_trace_shell_process (PyObject *self,PyObject *args,PyObject *kwargs) { -const char *plugin ="__main__" , *py_callback ="callback" , *instance_name; +const char *plugin ="__main__" , *py_callback ="callback" ;static char *kwlist[] = {"process" ,"plugin" ,"callback" ,"instance" ,NULL };struct tracefs_instance *instance; +PyObject *py_inst =NULL ;struct tep_handle *tep;PyObject *py_func;char *process;pid_t pid; - instance_name =NO_ARG ;if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"s|sss" , +"s|ssO" , kwlist, &process, &plugin, &py_callback, - &instance_name)) { + &py_inst)) {return NULL ; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return NULL ;if (!init_callback_tep (instance, plugin, py_callback, &tep, &py_func))
@@ -2050,27 +1883,27 @@ PyObject *PyFtrace_trace_shell_process(PyObject *self, PyObject *args,PyObject *PyFtrace_trace_process (PyObject *self,PyObject *args,PyObject *kwargs) { -const char *plugin ="__main__" , *py_callback ="callback" , *instance_name; +const char *plugin ="__main__" , *py_callback ="callback" ;static char *kwlist[] = {"argv" ,"plugin" ,"callback" ,"instance" ,NULL };struct tracefs_instance *instance; +PyObject *py_inst =NULL ;struct tep_handle *tep;PyObject *py_func, *py_argv, *py_arg;pid_t pid;int i, argc; - instance_name =NO_ARG ;if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"O|sss" , +"O|ssO" , kwlist, &py_argv, &plugin, &py_callback, - &instance_name)) { + &py_inst)) {return NULL ; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return NULL ;if (!init_callback_tep (instance, plugin, py_callback, &tep, &py_func))
@@ -2153,8 +1986,7 @@ PyObject *PyFtrace_iterate_trace(PyObject *self, PyObject *args,const char *plugin ="__main__" , *py_callback ="callback" ;bool *callback_status = &callback_ctx.status;bool *keep_going = &iterate_keep_going; - -const char *instance_name; +PyObject *py_inst =NULL ;struct tep_handle *tep;PyObject *py_func;int ret;
@@ -2162,20 +1994,19 @@ PyObject *PyFtrace_iterate_trace(PyObject *self, PyObject *args, (*(volatile bool *)keep_going) = true;signal (SIGINT , iterate_stop); - instance_name =NO_ARG ;if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"|sss" , +"|ssO" , kwlist, &plugin, &py_callback, - &instance_name)) { + &py_inst)) {return NULL ; } py_func =get_callback_func (plugin, py_callback);if (!py_func || - !get_optional_instance (instance_name, &itr_instance) || + !get_optional_instance (py_inst, &itr_instance) || !notrace_this_pid (itr_instance))return NULL ;
@@ -2199,22 +2030,22 @@ PyObject *PyFtrace_iterate_trace(PyObject *self, PyObject *args,PyObject *PyFtrace_hook2pid (PyObject *self,PyObject *args,PyObject *kwargs) {static char *kwlist[] = {"pid" ,"fork" ,"instance" ,NULL }; -const char *instance_name =NO_ARG ;struct tracefs_instance *instance; +PyObject *py_inst =NULL ;PyObject *pid_val;int fork =-1 ;if (!PyArg_ParseTupleAndKeywords (args, kwargs, -"O|ps" , +"O|pO" , kwlist, &pid_val, &fork, - &instance_name)) { + &py_inst)) {return NULL ; } -if (!get_optional_instance (instance_name, &instance)) +if (!get_optional_instance (py_inst, &instance))return NULL ;if (!hook2pid (instance, pid_val, fork))
@@ -2226,5 +2057,4 @@ PyObject *PyFtrace_hook2pid(PyObject *self, PyObject *args, PyObject *kwargs)void PyFtrace_at_exit (void ) {destroy_all_kprobes (); -destroy_all_instances (); }
src/ftracepy-utils.h +0 -10
@@ -53,16 +53,6 @@ PyObject *PyFtrace_dir(PyObject *self);PyObject *PyFtrace_create_instance (PyObject *self,PyObject *args,PyObject *kwargs); -PyObject *PyFtrace_destroy_instance (PyObject *self,PyObject *args, -PyObject *kwargs); - -PyObject *PyFtrace_get_all_instances (PyObject *self); - -PyObject *PyFtrace_destroy_all_instances (PyObject *self); - -PyObject *PyFtrace_instance_dir (PyObject *self,PyObject *args, -PyObject *kwargs); -PyObject *PyFtrace_available_tracers (PyObject *self,PyObject *args,PyObject *kwargs);
src/ftracepy.c +0 -20
@@ -95,26 +95,6 @@ static PyMethodDef ftracepy_methods[] = {METH_VARARGS |METH_KEYWORDS ,"Create new tracefs instance." }, - {"get_all_instances", - (PyCFunction ) PyFtrace_get_all_instances, -METH_NOARGS , -"Get all existing tracefs instances." - }, - {"destroy_instance", - (PyCFunction ) PyFtrace_destroy_instance, -METH_VARARGS |METH_KEYWORDS , -"Destroy existing tracefs instance." - }, - {"destroy_all_instances", - (PyCFunction ) PyFtrace_destroy_all_instances, -METH_NOARGS , -"Destroy all existing tracefs instances." - }, - {"instance_dir", - (PyCFunction ) PyFtrace_instance_dir, -METH_VARARGS |METH_KEYWORDS , -"Get the absolute path to the instance directory." - }, {"available_tracers", (PyCFunction ) PyFtrace_available_tracers, METH_VARARGS | METH_KEYWORDS,
tests/1_unit/test_01_ftracepy_unit.py +98 -147
496 lines not on this page · raw message
tests/2_integration/test_01_ftracepy_integration.py +23 -33
109 lines not on this page · raw message
Signature · 1 line
2.30.2