iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools lib traceevent: Make plugin unload function receive pevent

Browse Source 
The PEVENT_PLUGIN_UNLOADER function might need some cleanup using pevent
like unregister some handlers.  So pass pevent as argument.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-by: Jiri Olsa <jolsa@redhat.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1389750340-15965-6-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2014-01-15 10:45:28 +09:00 committed by Arnaldo Carvalho de Melo
parent e825e756f8
commit 8d0c2224ca
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/lib/traceevent/event-parse.h
View File

@ -105,7 +105,7 @@ typedef int (*pevent_event_handler_func)(struct trace_seq *s,
void *context); void *context);
typedef int (*pevent_plugin_load_func)(struct pevent *pevent); typedef int (*pevent_plugin_load_func)(struct pevent *pevent);
typedef int (*pevent_plugin_unload_func)(void); typedef int (*pevent_plugin_unload_func)(struct pevent *pevent);
struct plugin_option { struct plugin_option {
struct plugin_option *next; struct plugin_option *next;
@ -130,7 +130,7 @@ struct plugin_option {
* PEVENT_PLUGIN_UNLOADER: (optional) * PEVENT_PLUGIN_UNLOADER: (optional)
* The function called just before unloading * The function called just before unloading
* *
* int PEVENT_PLUGIN_UNLOADER(void) * int PEVENT_PLUGIN_UNLOADER(struct pevent *pevent)
* *
* PEVENT_PLUGIN_OPTIONS: (optional) * PEVENT_PLUGIN_OPTIONS: (optional)
* Plugin options that can be set before loading * Plugin options that can be set before loading
@ -411,7 +411,8 @@ enum pevent_errno {
struct plugin_list; struct plugin_list;
struct plugin_list *traceevent_load_plugins(struct pevent *pevent); struct plugin_list *traceevent_load_plugins(struct pevent *pevent);
void traceevent_unload_plugins(struct plugin_list *plugin_list); void traceevent_unload_plugins(struct plugin_list *plugin_list,
struct pevent *pevent);
struct cmdline; struct cmdline;
struct cmdline_list; struct cmdline_list;

4
tools/lib/traceevent/event-plugin.c
View File

@ -197,7 +197,7 @@ traceevent_load_plugins(struct pevent *pevent)
} }
void void
traceevent_unload_plugins(struct plugin_list *plugin_list) traceevent_unload_plugins(struct plugin_list *plugin_list, struct pevent *pevent)
{ {
pevent_plugin_unload_func func; pevent_plugin_unload_func func;
struct plugin_list *list; struct plugin_list *list;
@ -207,7 +207,7 @@ traceevent_unload_plugins(struct plugin_list *plugin_list)
plugin_list = list->next; plugin_list = list->next;
func = dlsym(list->handle, PEVENT_PLUGIN_UNLOADER_NAME); func = dlsym(list->handle, PEVENT_PLUGIN_UNLOADER_NAME);
if (func) if (func)
func(); func(pevent);
dlclose(list->handle); dlclose(list->handle);
free(list->name); free(list->name);
free(list); free(list);

2
tools/lib/traceevent/plugin_function.c
View File

@ -144,7 +144,7 @@ int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
return 0; return 0;
} }
void PEVENT_PLUGIN_UNLOADER(void) void PEVENT_PLUGIN_UNLOADER(struct pevent *pevent)
{ {
int i, x; int i, x;

2
tools/perf/util/trace-event.c
View File

@ -34,8 +34,8 @@ int trace_event__init(struct trace_event *t)
void trace_event__cleanup(struct trace_event *t) void trace_event__cleanup(struct trace_event *t)
{ {
traceevent_unload_plugins(t->plugin_list, t->pevent);
pevent_free(t->pevent); pevent_free(t->pevent);
traceevent_unload_plugins(t->plugin_list);
} }
static struct event_format* static struct event_format*