Remove redundant trace-cmd plugin handling logic
cover Remove redundant trace-cmd plugin handling logic
Currently there are no trace-cmd related plugins, all of them are designed to be used with libtraceeevnt. As both libtraceevent and trace-cmd have logic for managing plugins, the one in trace-cmd is redundant. Those redundant code is removed and replaced with calls to libtraceeevnt plugin APIs. When trace-cmd has to load any plugins, it uses libtraceeevnt to do the job.
Tzvetomir Stoyanov (VMware) (2):
trace-cmd: Move kernel_stack event handler to "function" plugin.
trace-cmd: Move plugin options from trace-cmd to libtraceevent.
trace-cmd: Remove trace-cmd plugin handling routines
include/trace-cmd/trace-cmd.h | 24 - include/traceevent/event-parse.h | 8 + kernel-shark/src/libkshark.c | 4 +- lib/trace-cmd/trace-ftrace.c | 56 +-- lib/trace-cmd/trace-input.c | 9 +- lib/trace-cmd/trace-util.c | 752 +------------------------------ lib/traceevent/event-plugin.c | 192 +++++++- plugins/plugin_function.c | 45 +- plugins/plugin_python.c | 9 +- tracecmd/trace-check-events.c | 10 +- tracecmd/trace-list.c | 23 +- tracecmd/trace-read.c | 2 +- 12 files changed, 278 insertions(+), 856 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/3 trace-cmd: Move kernel_stack event handler to "function" plugin.
The "kernel_stack" event handler does not depend on any trace-cmd context, it can be used aside from the application. The code is moved to libtraceevent "function" plugin.
--- lib/trace-cmd/trace-ftrace.c | 52 ------------------------------------ plugins/plugin_function.c | 41 ++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 52 deletions(-)
lib/trace-cmd/trace-ftrace.c +0 -52
@@ -31,17 +31,6 @@ struct tep_plugin_option trace_ftrace_options[] = {static struct tep_plugin_option *fgraph_tail = &trace_ftrace_options[0 ];static struct tep_plugin_option *fgraph_depth = &trace_ftrace_options[1 ]; -static void find_long_size (struct tracecmd_ftrace *finfo) -{ - finfo->long_size =tracecmd_long_size (finfo->handle); -} - -#define long_size_check (handle) \ - do { \ - if (!finfo->long_size) \ - find_long_size(finfo); \ - } while (0) -static int find_ret_event (struct tracecmd_ftrace *finfo,struct tep_handle *pevent) {struct tep_event *event;
@@ -361,44 +350,6 @@ fgraph_ret_handler(struct trace_seq *s, struct tep_record *record,return 0 ; } -static int -trace_stack_handler (struct trace_seq *s,struct tep_record *record, -struct tep_event *event,void *context) -{ -struct tracecmd_ftrace *finfo = context; -struct tep_format_field *field; -unsigned long long addr; -const char *func; -void *data = record->data; - - field =tep_find_any_field (event,"caller" ); -if (!field) { -trace_seq_printf (s,"<CANT FIND FIELD %s>" ,"caller" ); -return 0 ; - } - -trace_seq_puts (s,"<stack trace>\n" ); - -long_size_check (finfo); - -for (data += field->offset; data < record->data + record->size; - data += finfo->long_size) { - addr =tep_read_number (event->tep, data, finfo->long_size); - -if ((finfo->long_size ==8 && addr == (unsigned long long )-1 ) || - ((int )addr ==-1 )) -break ; - - func =tep_find_function (event->tep, addr); -if (func) -trace_seq_printf (s,"=> %s (%llx)\n" , func, addr); -else -trace_seq_printf (s,"=> %llx\n" , addr); - } - -return 0 ; -} -/** * tracecmd_ftrace_load_options - load the ftrace options *
@@ -430,9 +381,6 @@ int tracecmd_ftrace_overrides(struct tracecmd_input *handle,tep_register_event_handler (pevent,-1 ,"ftrace" ,"funcgraph_exit" , fgraph_ret_handler, finfo); -tep_register_event_handler (pevent,-1 ,"ftrace" ,"kernel_stack" , - trace_stack_handler, finfo); -trace_util_add_options ("ftrace" , trace_ftrace_options);/* Store the func ret id and event for later use */
plugins/plugin_function.c +41 -0
52 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH 2/3 trace-cmd: Move plugin options from trace-cmd to libtraceevent.
In reply to Tzvetomir Stoyanov (VMware)There are two different implementations of plugin options, which work in parallel - one in trace-cmd and the other one in libtraceevent. Both have the same functionality and most of the implementation is the same, duplicated. As currently there are only libtraceevent plugins,the implementation plugin options should be in libtraceevent only.
--- include/trace-cmd/trace-cmd.h | 6 - include/traceevent/event-parse.h | 2 + kernel-shark/src/libkshark.c | 4 +- lib/trace-cmd/trace-ftrace.c | 4 +- lib/trace-cmd/trace-util.c | 422 ------------------------------- lib/traceevent/event-plugin.c | 173 +++++++++++++ plugins/plugin_function.c | 4 +- tracecmd/trace-list.c | 2 +- tracecmd/trace-read.c | 2 +- 9 files changed, 183 insertions(+), 436 deletions(-)
include/trace-cmd/trace-cmd.h +0 -6
@@ -337,9 +337,6 @@ void tracecmd_msg_set_done(struct tracecmd_msg_handle *msg_handle);/* --- Plugin handling --- */ extern struct tep_plugin_option trace_ftrace_options[]; -int trace_util_add_options (const char *name,struct tep_plugin_option *options); -void trace_util_remove_options (struct tep_plugin_option *options); -int trace_util_add_option (const char *name,const char *val); int trace_util_load_plugins(struct tep_handle *pevent, const char *suffix, int (*load_plugin)(struct tep_handle *pevent, const char *path,
@@ -352,10 +349,7 @@ char **trace_util_find_plugin_files(const char *suffix);void trace_util_free_plugin_files (char **files);void trace_util_print_plugins (struct trace_seq *s,const char *prefix,const char *suffix,const struct tep_plugin_list *list); -void trace_util_print_plugin_options (struct trace_seq *s); -char **trace_util_list_plugin_options (void );void trace_util_free_plugin_options_list (char **list); -const char *trace_util_plugin_option_value (const char *name);/* Used for trace-cmd list */ void tracecmd_ftrace_load_options (void );
include/traceevent/event-parse.h +2 -0
@@ -386,7 +386,9 @@ char **tep_plugin_list_options(void);void tep_plugin_free_options_list (char **list);int tep_plugin_add_options (const char *name,struct tep_plugin_option *options); +int tep_plugin_add_option (const char *name,const char *val);void tep_plugin_remove_options (struct tep_plugin_option *options); +void tep_plugin_print_options (struct trace_seq *s);void tep_print_plugins (struct trace_seq *s,const char *prefix,const char *suffix,const struct tep_plugin_list *list);
kernel-shark/src/libkshark.c +2 -2
@@ -160,8 +160,8 @@ bool kshark_open(struct kshark_context *kshark_ctx, const char *file)* Turn off function trace indent and turn on show parent * if possible. */ -trace_util_add_option ("ftrace:parent" ,"1" ); -trace_util_add_option ("ftrace:indent" ,"0" ); +tep_plugin_add_option ("ftrace:parent" ,"1" ); +tep_plugin_add_option ("ftrace:indent" ,"0" );return true; }
lib/trace-cmd/trace-ftrace.c +2 -2
@@ -359,7 +359,7 @@ fgraph_ret_handler(struct trace_seq *s, struct tep_record *record,*/ void tracecmd_ftrace_load_options (void ) { -trace_util_add_options ("ftrace" , trace_ftrace_options); +tep_plugin_add_options ("ftrace" , trace_ftrace_options); } int tracecmd_ftrace_overrides(struct tracecmd_input *handle,
@@ -381,7 +381,7 @@ int tracecmd_ftrace_overrides(struct tracecmd_input *handle,tep_register_event_handler (pevent,-1 ,"ftrace" ,"funcgraph_exit" , fgraph_ret_handler, finfo); -trace_util_add_options ("ftrace" , trace_ftrace_options); +tep_plugin_add_options ("ftrace" , trace_ftrace_options);/* Store the func ret id and event for later use */ event =tep_find_event_by_name (pevent,"ftrace" ,"funcgraph_exit" );
lib/trace-cmd/trace-util.c +0 -422
463 lines not on this page · raw message
lib/traceevent/event-plugin.c +173 -0
197 lines not on this page · raw message
plugins/plugin_function.c +2 -2
@@ -215,7 +215,7 @@ int TEP_PLUGIN_LOADER(struct tep_handle *tep)tep_register_event_handler (tep,-1 ,"ftrace" ,"kernel_stack" , trace_stack_handler,NULL ); -trace_util_add_options ("ftrace" , plugin_options); +tep_plugin_add_options ("ftrace" , plugin_options);return 0 ; }
@@ -233,7 +233,7 @@ void TEP_PLUGIN_UNLOADER(struct tep_handle *tep)free (fstack[i].stack); } -trace_util_remove_options (plugin_options); +tep_plugin_remove_options (plugin_options);free (fstack); fstack =NULL ;
tracecmd/trace-list.c +1 -1
@@ -320,7 +320,7 @@ static void show_plugin_options(void)trace_seq_init (&s); list =tracecmd_load_plugins (pevent); -trace_util_print_plugin_options (&s); +tep_plugin_print_options (&s);trace_seq_do_printf (&s);tracecmd_unload_plugins (list, pevent);tep_free (pevent);
tracecmd/trace-read.c +1 -1
@@ -1337,7 +1337,7 @@ static void process_plugin_option(char *option) *p ='\0' ; val = p+1 ; } -trace_util_add_option (name, val); +tep_plugin_add_option (name, val); } static void set_event_flags(struct tep_handle *pevent, struct event_str *list,
Signature · 1 line
2.21.0
Re: [PATCH 2/3] trace-cmd: Move plugin options from trace-cmd to libtraceevent.
Quoted 7 lines · On Fri, 26 Jul 2019 15:43:07 +0300 "Tzvetomir Stoyanov (VMware)"…
lib/trace-cmd/trace-util.c +0
-1@@ -29,18 +29,6 @@int tracecmd_disable_sys_plugins;int tracecmd_disable_plugins; -static struct registered_plugin_options {
lib/trace-cmd/trace-util.c line 42
Quoted 10 lines
lib/trace-cmd/trace-util.c +0
-10-struct registered_plugin_options *next; -struct tep_plugin_option *options; -} *registered_options; - -static struct trace_plugin_options { -struct trace_plugin_options *next; -char *plugin; -char *option; -char *value; -} *trace_plugin_options;
Hmm, so this is identical to what's in lib/traceevent/event-plugin.c.
This doesn't affect this patch (and I may just take this patch as is), but I'm thinking that we should make the plugins part of the tep handler. That way, if you have two different tep handlers, each one will need to register its own set of plugins.
We'll have to look to see if that's possible, because we will need to do that for the application as a whole. Or perhaps we can add a "tep_clone_plugin" option that allows a single "plugin" to be registered to multiple tep handlers.
Again, this is a conversation not to really do with this patch, but something to think about before releasing the libtraceevent library to the wild.
-- Steve
PATCH 3/3 trace-cmd: Remove trace-cmd plugin handling routines
In reply to Tzvetomir Stoyanov (VMware)From: Tzvetomir Stoyanov (VMware) <[email protected]>
Currently there are no trace-cmd related plugins, all of them are designed to be used with libtraceeevnt. As both libtraceevent and trace-cmd have logic for managing plugins, the one in trace-cmd is redundant. Those redundant code is removed and replaced with calls to libtraceeevnt plugin APIs. When trace-cmd has to load any plugins, it uses libtraceeevnt to do the job.
Removed trace-cmd functions:
tracecmd_load_plugins()
tracecmd_unload_plugins()
trace_util_load_plugins()
trace_util_read_plugin_options()
trace_util_free_options()
trace_util_print_plugins()
trace_util_free_plugin_options_list()
A new libtraceevent API is added:
tep_load_plugins_hook() - the local static
function load_plugins() is exposed as API, as this functionality is needed be trace-cmd.
--- include/trace-cmd/trace-cmd.h | 18 -- include/traceevent/event-parse.h | 6 + lib/trace-cmd/trace-input.c | 9 +- lib/trace-cmd/trace-util.c | 330 +------------------------------ lib/traceevent/event-plugin.c | 19 +- plugins/plugin_python.c | 9 +- tracecmd/trace-check-events.c | 10 +- tracecmd/trace-list.c | 21 +- 8 files changed, 54 insertions(+), 368 deletions(-)
include/trace-cmd/trace-cmd.h +0 -18
@@ -25,10 +25,6 @@ void tracecmd_parse_ftrace_printk(struct tep_handle *pevent, char *file, unsigneextern int tracecmd_disable_sys_plugins;extern int tracecmd_disable_plugins; -struct tep_plugin_list ; -struct tep_plugin_list *tracecmd_load_plugins (struct tep_handle *pevent); -void tracecmd_unload_plugins (struct tep_plugin_list *list,struct tep_handle *pevent); -char **tracecmd_event_systems (const char *tracing_dir);char **tracecmd_system_events (const char *tracing_dir,const char *system);struct tep_handle *tracecmd_local_events (const char *tracing_dir);
@@ -334,22 +330,8 @@ int tracecmd_msg_collect_data(struct tracecmd_msg_handle *msg_handle, int ofd);bool tracecmd_msg_done (struct tracecmd_msg_handle *msg_handle);void tracecmd_msg_set_done (struct tracecmd_msg_handle *msg_handle); -/* --- Plugin handling --- */ -extern struct tep_plugin_option trace_ftrace_options[]; - -int trace_util_load_plugins (struct tep_handle *pevent,const char *suffix, -int (*load_plugin)(struct tep_handle *pevent, -const char *path, -const char *name, -void *data), -void *data); -struct tep_plugin_option *trace_util_read_plugin_options (void ); -void trace_util_free_options (struct tep_plugin_option *options);char **trace_util_find_plugin_files (const char *suffix);void trace_util_free_plugin_files (char **files); -void trace_util_print_plugins (struct trace_seq *s,const char *prefix,const char *suffix, -const struct tep_plugin_list *list); -void trace_util_free_plugin_options_list (char **list);/* Used for trace-cmd list */ void tracecmd_ftrace_load_options (void );
include/traceevent/event-parse.h +6 -0
@@ -382,6 +382,12 @@ struct tep_plugin_list;struct tep_plugin_list *tep_load_plugins (struct tep_handle *tep);void tep_unload_plugins (struct tep_plugin_list *plugin_list,struct tep_handle *tep); +void tep_load_plugins_hook (struct tep_handle *tep,const char *suffix, +void (*load_plugin)(struct tep_handle *tep, +const char *path, +const char *name, +void *data), +void *data);char **tep_plugin_list_options (void );void tep_plugin_free_options_list (char **list); int tep_plugin_add_options(const char *name,
lib/trace-cmd/trace-input.c +7 -2
@@ -2687,10 +2687,15 @@ struct tracecmd_input *tracecmd_alloc_fd(int fd)if (!handle->pevent) goto failed_read; +if (tracecmd_disable_plugins) +tep_set_flag (handle->pevent,TEP_DISABLE_PLUGINS ); +if (tracecmd_disable_sys_plugins) +tep_set_flag (handle->pevent,TEP_DISABLE_SYS_PLUGINS ); +/* register default ftrace functions first */ tracecmd_ftrace_overrides (handle, &handle->finfo); - handle->plugin_list =tracecmd_load_plugins (handle->pevent); + handle->plugin_list =tep_load_plugins (handle->pevent);tep_set_file_bigendian (handle->pevent, buf[0 ]);tep_set_local_bigendian (handle->pevent,tracecmd_host_bigendian ());
@@ -2852,7 +2857,7 @@ void tracecmd_close(struct tracecmd_input *handle)tracecmd_close (handle->parent); else {/* Only main handle frees plugins and pevent */ -tracecmd_unload_plugins (handle->plugin_list, handle->pevent); +tep_unload_plugins (handle->plugin_list, handle->pevent);tep_free (handle->pevent); }free (handle);
lib/trace-cmd/trace-util.c +4 -326
384 lines not on this page · raw message
lib/traceevent/event-plugin.c +9 -10
@@ -538,20 +538,19 @@ load_plugins_dir(struct tep_handle *tep, const char *suffix,closedir (dir); } -static void -load_plugins (struct tep_handle *tep,const char *suffix, -void (*load_plugin)(struct tep_handle *tep, -const char *path, -const char *name, -void *data), -void *data) +void tep_load_plugins_hook (struct tep_handle *tep,const char *suffix, +void (*load_plugin)(struct tep_handle *tep, +const char *path, +const char *name, +void *data), +void *data) {char *home;char *path;char *envdir;int ret; -if (tep->flags &TEP_DISABLE_PLUGINS ) +if (tep && tep->flags &TEP_DISABLE_PLUGINS )return ;/*
@@ -559,7 +558,7 @@ load_plugins(struct tep_handle *tep, const char *suffix,* check that first. */ #ifdef PLUGIN_DIR -if (!(tep->flags &TEP_DISABLE_SYS_PLUGINS )) +if (!tep || !(tep->flags &TEP_DISABLE_SYS_PLUGINS ))load_plugins_dir (tep, suffix,PLUGIN_DIR , load_plugin, data);#endif
@@ -596,7 +595,7 @@ tep_load_plugins(struct tep_handle *tep) {struct tep_plugin_list *list =NULL ; -load_plugins (tep,".so" , load_plugin, &list); +tep_load_plugins_hook (tep,".so" , load_plugin, &list);return list; }
plugins/plugin_python.c +4 -5
@@ -20,7 +20,7 @@ static const char pyload[] ="finally:\n" " file.close()\n" ; -static int load_plugin (struct tep_handle *pevent,const char *path, +static void load_plugin (struct tep_handle *pevent,const char *path,const char *name,void *data) {PyObject *globals = data;
@@ -33,7 +33,7 @@ static int load_plugin(struct tep_handle *pevent, const char *path,PyObject *res;if (!full || !n) -return -ENOMEM ; +return ;strcpy (full, path);strcat (full,"/" );
@@ -44,7 +44,7 @@ static int load_plugin(struct tep_handle *pevent, const char *path, err =asprintf (&load, pyload, full, n);if (err <0 ) -return err; +return ; res =PyRun_String (load, Py_file_input, globals, globals);if (!res) {
@@ -55,7 +55,6 @@ static int load_plugin(struct tep_handle *pevent, const char *path,free (load); -return res ?0 :-1 ; }int TEP_PLUGIN_LOADER (struct tep_handle *pevent)
@@ -95,7 +94,7 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)Py_DECREF (py_pevent);Py_DECREF (str); -trace_util_load_plugins (pevent,".py" , load_plugin, globals); +tep_load_plugins_hook (pevent,".py" , load_plugin, globals);return 0 ; }
tracecmd/trace-check-events.c +8 -2
@@ -42,11 +42,17 @@ void trace_check_events(int argc, char **argv) pevent =tep_alloc ();if (!pevent)exit (EINVAL ); - list =tracecmd_load_plugins (pevent); + +if (tracecmd_disable_plugins) +tep_set_flag (pevent,TEP_DISABLE_PLUGINS ); +if (tracecmd_disable_sys_plugins) +tep_set_flag (pevent,TEP_DISABLE_SYS_PLUGINS ); + + list =tep_load_plugins (pevent); ret =tracecmd_fill_local_events (tracing, pevent, &parsing_failures);if (ret || parsing_failures) ret =EINVAL ; -tracecmd_unload_plugins (list, pevent); +tep_unload_plugins (list, pevent);tep_free (pevent);return ;
tracecmd/trace-list.c +16 -5
@@ -317,12 +317,17 @@ static void show_plugin_options(void)if (!pevent)die ("Can not allocate pevent\n" ); +if (tracecmd_disable_plugins) +tep_set_flag (pevent,TEP_DISABLE_PLUGINS ); +if (tracecmd_disable_sys_plugins) +tep_set_flag (pevent,TEP_DISABLE_SYS_PLUGINS ); +trace_seq_init (&s); - list =tracecmd_load_plugins (pevent); + list =tep_load_plugins (pevent);tep_plugin_print_options (&s);trace_seq_do_printf (&s); -tracecmd_unload_plugins (list, pevent); +tep_unload_plugins (list, pevent);tep_free (pevent); }
@@ -343,12 +348,18 @@ static void show_plugins(void)if (!pevent)die ("Can not allocate pevent\n" ); +if (tracecmd_disable_plugins) +tep_set_flag (pevent,TEP_DISABLE_PLUGINS ); +if (tracecmd_disable_sys_plugins) +tep_set_flag (pevent,TEP_DISABLE_SYS_PLUGINS ); +trace_seq_init (&s); - list =tracecmd_load_plugins (pevent); -trace_util_print_plugins (&s," " ,"\n" , list); + list =tep_load_plugins (pevent); +tep_print_plugins (&s," " ,"\n" , list); +trace_seq_do_printf (&s); -tracecmd_unload_plugins (list, pevent); +tep_unload_plugins (list, pevent);tep_free (pevent); }
Signature · 1 line
2.21.0