From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@redhat.com>,
Corey Ashford <cjashfor@linux.vnet.ibm.com>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@elte.hu>, Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Steven Rostedt <rostedt@goodmis.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 13/38] tools lib traceevent: Add plugin support
Date: Wed, 4 Dec 2013 17:06:37 -0300 [thread overview]
Message-ID: <1386187622-2928-14-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1386187622-2928-1-git-send-email-acme@infradead.org>
From: Jiri Olsa <jolsa@redhat.com>
Backporting plugin support for traceevent lib.
Backported from Steven Rostedt's trace-cmd repo (HEAD 0f2c2fb):
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
It's now possible to use following interface to load plugins
(shared objects) to enhance pevent object functionality.
The plugin interface/hooks are as follows:
(taken from event-parse.h comments)
- 'pevent_plugin_loader' (required)
The function name to initialized the plugin.
int pevent_plugin_loader(struct pevent *pevent)
- 'pevent_plugin_unloader' (optional)
The function called just before unloading
int pevent_plugin_unloader(void)
- 'pevent_plugin_options' (optional)
Plugin options that can be set before loading
struct plugin_option pevent_plugin_options[] = {
{
.name = "option-name",
.plugin_alias = "overide-file-name", (optional)
.description = "description of option to show users",
},
{
.name = NULL,
},
};
Array must end with .name = NULL;
The plugin_alias (below) can be used to give a shorter
name to access the variable. Useful if a plugin handles
more than one event.
NOTE options support is not backported yet.
- 'pevent_plugin_alias' (optional)
The name to use for finding options (uses filename if not defined)
New traceevent functions are added to search and load
available plugins:
struct plugin_list*
traceevent_load_plugins(struct pevent *pevent)
- loads plusing for 'struct pevent' object and returns
loaded plugins list
void traceevent_unload_plugins(struct plugin_list *plugin_list);
- unload plugin list
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1386076182-14484-3-git-send-email-jolsa@redhat.com
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/lib/traceevent/Makefile | 6 +-
tools/lib/traceevent/event-parse.h | 5 +
tools/lib/traceevent/event-plugin.c | 202 ++++++++++++++++++++++++++++++++++++
3 files changed, 212 insertions(+), 1 deletion(-)
create mode 100644 tools/lib/traceevent/event-plugin.c
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index fc1502098595..2ccb5bc800e8 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -180,7 +180,11 @@ $(obj)/%.o: $(src)/%.c
%.o: $(src)/%.c
$(Q)$(call do_compile)
-PEVENT_LIB_OBJS = event-parse.o trace-seq.o parse-filter.o parse-utils.o
+PEVENT_LIB_OBJS = event-parse.o
+PEVENT_LIB_OBJS += event-plugin.o
+PEVENT_LIB_OBJS += trace-seq.o
+PEVENT_LIB_OBJS += parse-filter.o
+PEVENT_LIB_OBJS += parse-utils.o
PEVENT_LIB_OBJS += kbuffer-parse.o
ALL_OBJS = $(PEVENT_LIB_OBJS)
diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
index 8d73d2594f65..a28886066bcc 100644
--- a/tools/lib/traceevent/event-parse.h
+++ b/tools/lib/traceevent/event-parse.h
@@ -377,6 +377,11 @@ enum pevent_errno {
};
#undef _PE
+struct plugin_list;
+
+struct plugin_list *traceevent_load_plugins(struct pevent *pevent);
+void traceevent_unload_plugins(struct plugin_list *plugin_list);
+
struct cmdline;
struct cmdline_list;
struct func_map;
diff --git a/tools/lib/traceevent/event-plugin.c b/tools/lib/traceevent/event-plugin.c
new file mode 100644
index 000000000000..d272d87aa7d4
--- /dev/null
+++ b/tools/lib/traceevent/event-plugin.c
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2009, 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License (not later!)
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, see <http://www.gnu.org/licenses>
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+
+#include <string.h>
+#include <dlfcn.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <dirent.h>
+#include "event-parse.h"
+#include "event-utils.h"
+
+#define LOCAL_PLUGIN_DIR ".traceevent/plugins"
+
+struct plugin_list {
+ struct plugin_list *next;
+ char *name;
+ void *handle;
+};
+
+static void
+load_plugin(struct pevent *pevent, const char *path,
+ const char *file, void *data)
+{
+ struct plugin_list **plugin_list = data;
+ pevent_plugin_load_func func;
+ struct plugin_list *list;
+ const char *alias;
+ char *plugin;
+ void *handle;
+
+ plugin = malloc_or_die(strlen(path) + strlen(file) + 2);
+
+ strcpy(plugin, path);
+ strcat(plugin, "/");
+ strcat(plugin, file);
+
+ handle = dlopen(plugin, RTLD_NOW | RTLD_GLOBAL);
+ if (!handle) {
+ warning("could not load plugin '%s'\n%s\n",
+ plugin, dlerror());
+ goto out_free;
+ }
+
+ alias = dlsym(handle, PEVENT_PLUGIN_ALIAS_NAME);
+ if (!alias)
+ alias = file;
+
+ func = dlsym(handle, PEVENT_PLUGIN_LOADER_NAME);
+ if (!func) {
+ warning("could not find func '%s' in plugin '%s'\n%s\n",
+ PEVENT_PLUGIN_LOADER_NAME, plugin, dlerror());
+ goto out_free;
+ }
+
+ list = malloc_or_die(sizeof(*list));
+ list->next = *plugin_list;
+ list->handle = handle;
+ list->name = plugin;
+ *plugin_list = list;
+
+ pr_stat("registering plugin: %s", plugin);
+ func(pevent);
+ return;
+
+ out_free:
+ free(plugin);
+}
+
+static void
+load_plugins_dir(struct pevent *pevent, const char *suffix,
+ const char *path,
+ void (*load_plugin)(struct pevent *pevent,
+ const char *path,
+ const char *name,
+ void *data),
+ void *data)
+{
+ struct dirent *dent;
+ struct stat st;
+ DIR *dir;
+ int ret;
+
+ ret = stat(path, &st);
+ if (ret < 0)
+ return;
+
+ if (!S_ISDIR(st.st_mode))
+ return;
+
+ dir = opendir(path);
+ if (!dir)
+ return;
+
+ while ((dent = readdir(dir))) {
+ const char *name = dent->d_name;
+
+ if (strcmp(name, ".") == 0 ||
+ strcmp(name, "..") == 0)
+ continue;
+
+ /* Only load plugins that end in suffix */
+ if (strcmp(name + (strlen(name) - strlen(suffix)), suffix) != 0)
+ continue;
+
+ load_plugin(pevent, path, name, data);
+ }
+
+ closedir(dir);
+}
+
+static void
+load_plugins(struct pevent *pevent, const char *suffix,
+ void (*load_plugin)(struct pevent *pevent,
+ const char *path,
+ const char *name,
+ void *data),
+ void *data)
+{
+ char *home;
+ char *path;
+ char *envdir;
+
+ /*
+ * If a system plugin directory was defined,
+ * check that first.
+ */
+#ifdef PLUGIN_DIR
+ load_plugins_dir(pevent, suffix, PLUGIN_DIR, load_plugin, data);
+#endif
+
+ /*
+ * Next let the environment-set plugin directory
+ * override the system defaults.
+ */
+ envdir = getenv("TRACEEVENT_PLUGIN_DIR");
+ if (envdir)
+ load_plugins_dir(pevent, suffix, envdir, load_plugin, data);
+
+ /*
+ * Now let the home directory override the environment
+ * or system defaults.
+ */
+ home = getenv("HOME");
+ if (!home)
+ return;
+
+ path = malloc_or_die(strlen(home) + strlen(LOCAL_PLUGIN_DIR) + 2);
+
+ strcpy(path, home);
+ strcat(path, "/");
+ strcat(path, LOCAL_PLUGIN_DIR);
+
+ load_plugins_dir(pevent, suffix, path, load_plugin, data);
+
+ free(path);
+}
+
+struct plugin_list*
+traceevent_load_plugins(struct pevent *pevent)
+{
+ struct plugin_list *list = NULL;
+
+ load_plugins(pevent, ".so", load_plugin, &list);
+ return list;
+}
+
+void
+traceevent_unload_plugins(struct plugin_list *plugin_list)
+{
+ pevent_plugin_unload_func func;
+ struct plugin_list *list;
+
+ while (plugin_list) {
+ list = plugin_list;
+ plugin_list = list->next;
+ func = dlsym(list->handle, PEVENT_PLUGIN_UNLOADER_NAME);
+ if (func)
+ func();
+ dlclose(list->handle);
+ free(list->name);
+ free(list);
+ }
+}
--
1.8.1.4
next prev parent reply other threads:[~2013-12-04 20:08 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-04 20:06 [GIT PULL 00/38] perf/core improvements and fixes Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 01/38] perf tools: Use asprintf instead of malloc plus snprintf Arnaldo Carvalho de Melo
2013-12-11 22:16 ` Andi Kleen
2013-12-12 14:57 ` Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 02/38] perf symbols: Retain bfd reference to lookup source line numbers Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 03/38] perf symbols: Retain symbol source file name " Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 04/38] perf tools: Do not disable source line lookup just because of 1 failure Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 05/38] perf tools: Remove stackprotector feature check Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 06/38] perf tools: Remove condition in machine__get_kernel_start_addr Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 07/38] perf target: Move the checking of which map function to call into function Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 08/38] perf kvm: Add more detail about buildid-list in man page Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 09/38] perf kvm: Fix spurious '=' use " Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 10/38] perf kvm: Update the 'record' man page entry for new --guest/--host behavior Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 11/38] perf symbols: Fix random fd closing with no libelf Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 12/38] perf script: Do not call perf_event__preprocess_sample() twice) Arnaldo Carvalho de Melo
2013-12-04 20:06 ` Arnaldo Carvalho de Melo [this message]
2013-12-04 20:06 ` [PATCH 14/38] tools lib traceevent: Add plugin build support Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 15/38] tools lib traceevent: Add traceevent_host_bigendian function Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 16/38] tools lib traceevent: Change pevent_parse_format to include pevent handle Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 17/38] tools lib traceevent: Harmonize the install messages in lib-traceevent Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 18/38] perf tools: Add build and install plugins targets Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 19/38] perf tools: Add filename__read_str util function Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 20/38] perf tools: Add trace-event object Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 21/38] perf tools: Add trace-event global object for tracepoint interface Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 22/38] perf tools: Overload pr_stat traceevent print function Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 23/38] tools lib traceevent: Add jbd2 plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 24/38] tools lib traceevent: Add hrtimer plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 25/38] tools lib traceevent: Add kmem plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 26/38] tools lib traceevent: Add kvm plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 27/38] tools lib traceevent: Add mac80211 plugin Arnaldo Carvalho de Melo
2014-06-13 3:13 ` Steven Rostedt
2014-06-13 17:57 ` Johannes Berg
2014-06-13 18:18 ` Steven Rostedt
2013-12-04 20:06 ` [PATCH 28/38] tools lib traceevent: Add sched_switch plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 29/38] tools lib traceevent: Add function plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 30/38] tools lib traceevent: Add xen plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 31/38] tools lib traceevent: Add scsi plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 32/38] tools lib traceevent: Add cfg80211 plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 33/38] tools lib traceevent: Remove malloc_or_die from event-plugin.c Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 34/38] tools lib traceevent: Use static functions in jbd2 plugin Arnaldo Carvalho de Melo
2013-12-04 20:06 ` [PATCH 35/38] tools lib traceevent: Use pevent_print_func_field in hrtimer_start handler Arnaldo Carvalho de Melo
2013-12-04 20:07 ` [PATCH 36/38] tools lib traceevent: Several cleanups for function plugin Arnaldo Carvalho de Melo
2013-12-04 20:07 ` [PATCH 37/38] tools lib traceevent: Remove malloc_or_die from plugin_function.c Arnaldo Carvalho de Melo
2013-12-04 20:07 ` [PATCH 38/38] tools lib traceevent: Update kvm plugin with is_writable_pte helper Arnaldo Carvalho de Melo
2013-12-05 10:04 ` [GIT PULL 00/38] perf/core improvements and fixes Ingo Molnar
2013-12-05 10:37 ` Jiri Olsa
2013-12-05 10:53 ` Ingo Molnar
2013-12-05 10:59 ` Ingo Molnar
2013-12-05 11:13 ` Jiri Olsa
2013-12-05 12:27 ` Ingo Molnar
2013-12-05 12:35 ` Jiri Olsa
2013-12-05 11:05 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386187622-2928-14-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).