trace-cruncher: Add methods for accessing tracefs errorlog
PATCH 1/3 trace-cruncher: Add methods for accessing tracefs errorlog
Just wrapping the corresponding APIs of libtracefs.
The functionalities are also available as static methods and will be used by the module itself when printing the error messages.
Signed-off-by Yordan Karadzhov (VMware) <[email protected]>
--- src/ftracepy-utils.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ src/ftracepy-utils.h | 6 ++++ src/ftracepy.c | 10 +++++++ 3 files changed, 83 insertions(+)
src/ftracepy-utils.c +67 -0
@@ -23,6 +23,37 @@ PyObject *TFS_ERROR;PyObject *TEP_ERROR ;PyObject *TRACECRUNCHER_ERROR ; +static const char *get_instance_name (struct tracefs_instance *instance); + +static char *tfs_error_log (struct tracefs_instance *instance,bool *ok) +{; +char *err_log =tracefs_error_all (instance); + + errno =0 ; +if (errno && !err_log) { +PyErr_Format (TFS_ERROR , +"Unable to get error log for instance \'%s\'." , +get_instance_name (instance)); + } + +if (ok) + *ok = errno ? false : true; + +return err_log; +} + +static bool tfs_clear_error_log (struct tracefs_instance *instance) +{ +if (tracefs_error_clear (instance) <0 ) { +PyErr_Format (TFS_ERROR , +"Unable to clear error log for instance \'%s\'." , +get_instance_name (instance)); +return false; + } + +return true; +} +PyObject *PyTepRecord_time (PyTepRecord * self) {unsigned long ts = self->ptrObj ? self->ptrObj->ts :0 ;
@@ -2051,6 +2082,42 @@ PyObject *PyFtrace_hook2pid(PyObject *self, PyObject *args, PyObject *kwargs) Py_RETURN_NONE; } +PyObject *PyFtrace_error_log (PyObject *self,PyObject *args, +PyObject *kwargs) +{ +struct tracefs_instance *instance; +PyObject *ret =NULL ; +char *err_log; +bool ok; + +if (!get_instance_from_arg (args, kwargs, &instance)) +return NULL ; + + err_log =tfs_error_log (instance, &ok); +if (err_log) { + ret =PyUnicode_FromString (err_log); +free (err_log); + }else if (ok) { + ret =PyUnicode_FromString ("(nil)" ); + } + +return ret; +} + +PyObject *PyFtrace_clear_error_log (PyObject *self,PyObject *args, +PyObject *kwargs) +{ +struct tracefs_instance *instance; + +if (!get_instance_from_arg (args, kwargs, &instance)) +return NULL ; + +if (!tfs_clear_error_log (instance)) +return NULL ; + + Py_RETURN_NONE; +} +void PyFtrace_at_exit (void ) { }
src/ftracepy-utils.h +6 -0
@@ -177,6 +177,12 @@ PyObject *PyFtrace_iterate_trace(PyObject *self, PyObject *args,PyObject *PyFtrace_hook2pid (PyObject *self,PyObject *args,PyObject *kwargs); +PyObject *PyFtrace_error_log (PyObject *self,PyObject *args, +PyObject *kwargs); + +PyObject *PyFtrace_clear_error_log (PyObject *self,PyObject *args, +PyObject *kwargs); +void PyFtrace_at_exit (void );#endif
src/ftracepy.c +10 -0
@@ -310,6 +310,16 @@ static PyMethodDef ftracepy_methods[] = { METH_VARARGS | METH_KEYWORDS, "Trace only particular process." }, + {"error_log" , + (PyCFunction ) PyFtrace_error_log, +METH_VARARGS |METH_KEYWORDS , +"Get the content of the error log." + }, + {"clear_error_log", + (PyCFunction ) PyFtrace_clear_error_log, +METH_VARARGS |METH_KEYWORDS , +"Clear the content of the error log." + }, {NULL, NULL, 0, NULL} };
Signature · 1 line
2.30.2
PATCH 2/3 trace-cruncher: Have standard 'not existing' message
The string "(nil)" is used to state that an object do not exists / is empty.
Signed-off-by Yordan Karadzhov (VMware) <[email protected]>
--- src/common.h | 2 ++ src/ftracepy-utils.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-)
src/common.h +2 -0
@@ -24,6 +24,8 @@static const char *NO_ARG ="/NONE/" ; +#define TC_NIL_MSG "(nil)" +static inline bool is_all (const char *arg) {const char all[] ="all" ;
src/ftracepy-utils.c +3 -3
@@ -68,7 +68,7 @@ PyObject *PyTepRecord_cpu(PyTepRecord* self)PyObject *PyTepEvent_name (PyTepEvent * self) { -const char * name = self->ptrObj ? self->ptrObj->name :"nil" ; +const char *name = self->ptrObj ? self->ptrObj->name :TC_NIL_MSG ;return PyUnicode_FromString (name); }
@@ -169,7 +169,7 @@ PyObject *PyTepEvent_parse_record_field(PyTepEvent* self, PyObject *args, }if (!field_size) -return PyUnicode_FromString ("(nil)" ); +return PyUnicode_FromString (TC_NIL_MSG );if (field->flags &TEP_FIELD_IS_STRING ) {char *val_str = record->ptrObj->data + field_offset;
@@ -2098,7 +2098,7 @@ PyObject *PyFtrace_error_log(PyObject *self, PyObject *args, ret =PyUnicode_FromString (err_log);free (err_log); }else if (ok) { - ret =PyUnicode_FromString ("(nil)" ); + ret =PyUnicode_FromString (TC_NIL_MSG ); }return ret;
Signature · 1 line
2.30.2
PATCH 3/3 trace-cruncher: Print the tracefs log on an error
In reply to Yordan Karadzhov (VMware)Every time when an error is related to the usage of 'libtracefs' we check the tracefs error log and if it contains a message, this message is added to the stack of the Python error messages.
Signed-off-by Yordan Karadzhov (VMware) <[email protected]>
--- src/ftracepy-utils.c | 114 ++++++++++++++++++++++++++++--------------- 1 file changed, 76 insertions(+), 38 deletions(-)
src/ftracepy-utils.c +76 -38
@@ -54,6 +54,45 @@ static bool tfs_clear_error_log(struct tracefs_instance *instance)return true; } +static void TfsError_fmt (struct tracefs_instance *instance, +const char *fmt, ...) +{ +char *tfs_err_log =tfs_error_log (instance,NULL ); +va_list args; + +va_start (args, fmt); +if (tfs_err_log) { +char *tc_err_log; + +vasprintf (&tc_err_log, fmt, args); +va_end (args); + +PyErr_Format (TEP_ERROR ,"%s\ntfs_error: %s" , + tc_err_log, tfs_err_log); + +tfs_clear_error_log (instance); +free (tfs_err_log); +free (tc_err_log); + }else { +PyErr_FormatV (TEP_ERROR , fmt, args); +va_end (args); + } +} + +static void TfsError_setstr (struct tracefs_instance *instance, +const char *msg) +{ +char *tfs_err_log =tfs_error_log (instance,NULL ); + +if (tfs_err_log) { +PyErr_Format (TEP_ERROR ,"%s\ntfs_error: %s" , msg, tfs_err_log); +tfs_clear_error_log (instance); +free (tfs_err_log); + }else { +PyErr_SetString (TEP_ERROR , msg); + } +} +PyObject *PyTepRecord_time (PyTepRecord * self) {unsigned long ts = self->ptrObj ? self->ptrObj->ts :0 ;
@@ -283,7 +322,7 @@ PyObject *PyTep_init_local(PyTep *self, PyObject *args,const char **sys_names =get_arg_list (system_list);if (!sys_names) { -PyErr_SetString (TFS_ERROR , +TfsError_setstr (NULL ,"Inconsistent \"systems\" argument." );return NULL ; }
@@ -295,8 +334,7 @@ PyObject *PyTep_init_local(PyTep *self, PyObject *args, }if (!tep) { -PyErr_Format (TFS_ERROR , -"Failed to get local events from \'%s\'." , +TfsError_fmt (NULL ,"Failed to get local events from \'%s\'." , dir_str);return NULL ; }
@@ -331,7 +369,7 @@ PyObject *PyTep_get_event(PyTep *self, PyObject *args,static bool check_file (struct tracefs_instance *instance,const char *file) {if (!tracefs_file_exists (instance, file)) { -PyErr_Format (TFS_ERROR ,"File %s does not exist." , file); +TfsError_fmt (instance,"File %s does not exist." , file);return false; }
@@ -341,7 +379,7 @@ static bool check_file(struct tracefs_instance *instance, const char *file)static bool check_dir (struct tracefs_instance *instance,const char *dir) {if (!tracefs_dir_exists (instance, dir)) { -PyErr_Format (TFS_ERROR ,"Directory %s does not exist." , dir); +TfsError_fmt (instance,"Directory %s does not exist." , dir);return false; }
@@ -366,7 +404,7 @@ static int write_to_file(struct tracefs_instance *instance, size =tracefs_instance_file_write (instance, file, val);if (size <=0 ) { -PyErr_Format (TFS_ERROR , +TfsError_fmt (instance,"Can not write \'%s\' to file \'%s\' (inst: \'%s\')." , val, file,get_instance_name (instance));PyErr_Print ();
@@ -386,7 +424,7 @@ static int append_to_file(struct tracefs_instance *instance, size =tracefs_instance_file_append (instance, file, val);if (size <=0 ) { -PyErr_Format (TFS_ERROR , +TfsError_fmt (instance,"Can not append \'%s\' to file \'%s\' (inst: \'%s\')." , val, file,get_instance_name (instance));PyErr_Print ();
@@ -406,7 +444,7 @@ static int read_from_file(struct tracefs_instance *instance, *val =tracefs_instance_file_read (instance, file, &size);if (size <0 ) -PyErr_Format (TFS_ERROR ,"Can not read from file %s" , file); +TfsError_fmt (instance,"Can not read from file %s" , file);return size; }
@@ -529,7 +567,7 @@ PyObject *PyFtrace_create_instance(PyObject *self, PyObject *args,if (!instance || !tracefs_instance_exists (name) || !tracefs_instance_is_new (instance)) { -PyErr_Format (TFS_ERROR , +TfsError_fmt (instance,"Failed to create new trace instance \'%s\'." , name);return NULL ;
@@ -633,7 +671,7 @@ PyObject *PyFtrace_set_current_tracer(PyObject *self, PyObject *args, }if (!all_tracers || !all_tracers[i]) { -PyErr_Format (TFS_ERROR , +TfsError_fmt (instance,"Tracer \'%s\' is not available." , tracer);return NULL ;
@@ -643,7 +681,7 @@ PyObject *PyFtrace_set_current_tracer(PyObject *self, PyObject *args, }if (!write_to_file_and_check (instance, file, tracer)) { -PyErr_Format (TFS_ERROR ,"Failed to enable tracer \'%s\'" , +TfsError_fmt (instance,"Failed to enable tracer \'%s\'" , tracer);return NULL ; }
@@ -762,7 +800,7 @@ bool get_event_enable_file(struct tracefs_instance *instance, fail: instance_name = instance ?tracefs_instance_get_name (instance) :"top" ; -PyErr_Format (TFS_ERROR , +TfsError_fmt (instance,"Failed to locate event:\n Instance: %s System: %s Event: %s" , instance_name, system, event);free (buff);
@@ -788,7 +826,7 @@ static bool event_enable_disable(struct tracefs_instance *instance, ret =tracefs_event_disable (instance, system, event);if (ret !=0 ) { -PyErr_Format (TFS_ERROR , +TfsError_fmt (instance,"Failed to enable/disable event:\n System: %s Event: %s" , system ? system :"NULL" , event ? event :"NULL" );
@@ -878,7 +916,7 @@ static bool set_enable_events(PyObject *self, PyObject *args, PyObject *kwargs, is_all(PyUnicode_DATA(event_list))) { return event_enable_disable(instance, NULL, NULL, enable); } else { -PyErr_SetString (TFS_ERROR , +TfsError_setstr (instance,"Failed to enable events for unspecified system" );return false; }
@@ -886,7 +924,7 @@ static bool set_enable_events(PyObject *self, PyObject *args, PyObject *kwargs, systems =get_arg_list (system_list);if (!systems) { -PyErr_SetString (TFS_ERROR ,"Inconsistent \"systems\" argument." ); +TfsError_setstr (instance,"Inconsistent \"systems\" argument." );return false; }
@@ -926,7 +964,7 @@ static bool set_enable_events(PyObject *self, PyObject *args, PyObject *kwargs,return true; fail_with_err: -PyErr_SetString (TFS_ERROR ,"Inconsistent \"events\" argument." ); +TfsError_setstr (instance,"Inconsistent \"events\" argument." ); fail:free (systems);
@@ -1025,7 +1063,7 @@ PyObject *PyFtrace_set_event_filter(PyObject *self, PyObject *args,sprintf (path,"events/%s/%s/filter" , system, event);if (!write_to_file_and_check (instance, path, filter)) { -PyErr_SetString (TFS_ERROR ,"Failed to set event filter" ); +TfsError_setstr (instance,"Failed to set event filter" );return NULL ; }
@@ -1056,7 +1094,7 @@ PyObject *PyFtrace_clear_event_filter(PyObject *self, PyObject *args,sprintf (path,"events/%s/%s/filter" , system, event);if (!write_to_file (instance, path,OFF )) { -PyErr_SetString (TFS_ERROR ,"Failed to clear event filter" ); +TfsError_setstr (instance,"Failed to clear event filter" );return NULL ; }
@@ -1072,7 +1110,7 @@ static bool tracing_ON(struct tracefs_instance *instance)const char *instance_name = instance ?tracefs_instance_get_name (instance) :"top" ; -PyErr_Format (TFS_ERROR , +TfsError_fmt (instance,"Failed to start tracing (Instance: %s)" , instance_name);return false;
@@ -1104,7 +1142,7 @@ static bool tracing_OFF(struct tracefs_instance *instance)const char *instance_name = instance ?tracefs_instance_get_name (instance) :"top" ; -PyErr_Format (TFS_ERROR , +TfsError_fmt (instance,"Failed to stop tracing (Instance: %s)" , instance_name);return false;
@@ -1141,7 +1179,7 @@ PyObject *PyFtrace_is_tracing_ON(PyObject *self, PyObject *args,const char *instance_name = instance ?tracefs_instance_get_name (instance) :"top" ; -PyErr_Format (TFS_ERROR , +TfsError_fmt (instance,"Failed to check if tracing is ON (Instance: %s)" , instance_name);return NULL ;
@@ -1202,7 +1240,7 @@ static bool set_pid(struct tracefs_instance *instance,return true; fail: -PyErr_Format (TFS_ERROR ,"Failed to set PIDs for \"%s\"" , +TfsError_fmt (instance,"Failed to set PIDs for \"%s\"" , file);return false; }
@@ -1266,7 +1304,7 @@ static bool set_opt(struct tracefs_instance *instance,if (sprintf (file,"options/%s" , opt) <=0 || !write_to_file_and_check (instance, file, val)) { -PyErr_Format (TFS_ERROR ,"Failed to set option \"%s\"" , opt); +TfsError_fmt (instance,"Failed to set option \"%s\"" , opt);return false; }
@@ -1398,7 +1436,7 @@ static bool register_kprobe(const char *event, const char *probe) {if (tracefs_kprobe_raw (TC_SYS , event, function, probe) <0 ) { -PyErr_Format (TFS_ERROR ,"Failed to register kprobe \'%s\'." , +TfsError_fmt (NULL ,"Failed to register kprobe \'%s\'." , event);return false; }
@@ -1411,7 +1449,7 @@ static bool register_kretprobe(const char *event, const char *probe) {if (tracefs_kretprobe_raw (TC_SYS , event, function, probe) <0 ) { -PyErr_Format (TFS_ERROR ,"Failed to register kretprobe \'%s\'." , +TfsError_fmt (NULL ,"Failed to register kretprobe \'%s\'." , event);return false; }
@@ -1422,7 +1460,7 @@ static bool register_kretprobe(const char *event,static bool unregister_kprobe (const char *event) {if (tracefs_kprobe_clear_probe (TC_SYS , event, true) <0 ) { -PyErr_Format (TFS_ERROR ,"Failed to unregister kprobe \'%s\'." , +TfsError_fmt (NULL ,"Failed to unregister kprobe \'%s\'." , event);return false; }
@@ -1571,7 +1609,7 @@ PyObject *PyKprobe_set_filter(PyKprobe *self, PyObject *args,sprintf (path,"events/%s/%s/filter" ,TC_SYS , self->ptrObj->event);if (!write_to_file_and_check (instance, path, filter)) { -PyErr_SetString (TFS_ERROR ,"Failed to set kprobe filter." ); +TfsError_setstr (instance,"Failed to set kprobe filter." );return NULL ; }
@@ -1599,7 +1637,7 @@ PyObject *PyKprobe_clear_filter(PyKprobe *self, PyObject *args,sprintf (path,"events/%s/%s/filter" ,TC_SYS , self->ptrObj->event);if (!write_to_file (instance, path,OFF )) { -PyErr_SetString (TFS_ERROR ,"Failed to clear kprobe filter." ); +TfsError_setstr (instance,"Failed to clear kprobe filter." );return NULL ; }
@@ -1723,7 +1761,7 @@ static bool hook2pid(struct tracefs_instance *instance, PyObject *pid_val, int freturn true; fail: -PyErr_SetString (TFS_ERROR ,"Failed to hook to PID" ); +TfsError_setstr (instance,"Failed to hook to PID" );PyErr_Print ();return false; }
@@ -1740,7 +1778,7 @@ static void start_tracing_procces(struct tracefs_instance *instance,tracing_ON (instance);if (execvpe (argv[0 ], argv, envp) <0 ) { -PyErr_Format (TFS_ERROR ,"Failed to exec \'%s\'" , +TfsError_fmt (instance,"Failed to exec \'%s\'" , argv[0 ]); }
@@ -1754,14 +1792,14 @@ static PyObject *get_callback_func(const char *plugin_name, const char * py_call py_name =PyUnicode_FromString (plugin_name); py_module =PyImport_Import (py_name);if (!py_module) { -PyErr_Format (TFS_ERROR ,"Failed to import plugin \'%s\'" , +TfsError_fmt (NULL ,"Failed to import plugin \'%s\'" , plugin_name);return NULL ; } py_func =PyObject_GetAttrString (py_module, py_callback);if (!py_func || !PyCallable_Check (py_func)) { -PyErr_Format (TFS_ERROR , +TfsError_fmt (NULL ,"Failed to import callback from plugin \'%s\'" , plugin_name);return NULL ;
@@ -1817,7 +1855,7 @@ static bool notrace_this_pid(struct tracefs_instance *instance)if (!pid2file (instance,"set_ftrace_notrace_pid" , pid, true) || !pid2file (instance,"set_event_notrace_pid" , pid, true)) { -PyErr_SetString (TFS_ERROR , +TfsError_setstr (instance,"Failed to desable tracing for \'this\' process." );return false; }
@@ -1849,7 +1887,7 @@ static bool init_callback_tep(struct tracefs_instance *instance, *tep =tracefs_local_events (tracefs_instance_get_dir (instance));if (!*tep) { -PyErr_Format (TFS_ERROR , +TfsError_fmt (instance,"Unable to get 'tep' event from instance \'%s\'." ,get_instance_name (instance));return false;
@@ -1892,7 +1930,7 @@ PyObject *PyFtrace_trace_shell_process(PyObject *self, PyObject *args, pid =fork ();if (pid <0 ) { -PyErr_SetString (TFS_ERROR ,"Failed to fork" ); +TfsError_setstr (instance,"Failed to fork" );return NULL ; }
@@ -1938,7 +1976,7 @@ PyObject *PyFtrace_trace_process(PyObject *self, PyObject *args,return NULL ;if (!PyList_CheckExact (py_argv)) { -PyErr_SetString (TFS_ERROR ,"Failed to parse \'argv\' list" ); +TfsError_setstr (instance,"Failed to parse \'argv\' list" );return NULL ; }
@@ -1946,7 +1984,7 @@ PyObject *PyFtrace_trace_process(PyObject *self, PyObject *args, pid =fork ();if (pid <0 ) { -PyErr_SetString (TFS_ERROR ,"Failed to fork" ); +TfsError_setstr (instance,"Failed to fork" );return NULL ; }
@@ -1988,7 +2026,7 @@ PyObject *PyFtrace_read_trace(PyObject *self, PyObject *args,tracing_ON (pipe_instance);if (tracefs_trace_pipe_print (pipe_instance,0 ) <0 ) { -PyErr_Format (TFS_ERROR , +TfsError_fmt (pipe_instance,"Unable to read trace data from instance \'%s\'." ,get_instance_name (pipe_instance));return NULL ;
Signature · 1 line
2.30.2