3 files changed, 52 insertions, 85 deletions

diff --git a/plugin_python.c b/plugin_python.c
index 164e774..dada5dc 100644
--- a/plugin_python.c
+++ b/plugin_python.c
@@ -1,10 +1,5 @@
 #include <Python.h>
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #include <stdio.h>
-#include <dirent.h>
-#include <fnmatch.h>
 #include "trace-cmd.h"
 
 static const char pyload[] =
@@ -17,8 +12,10 @@ static const char pyload[] =
 "finally:\n"
 "   file.close()\n";
 
-static void load_plugin(PyObject *globals, char *path, const char *name)
+static void load_plugin(struct pevent *pevent, const char *path,
+                        const char *name, void *data)
 {
+        PyObject *globals = data;
         int len = strlen(path) + strlen(name) + 2;
         int nlen = strlen(name) + 1;
         char *full = malloc(len);
@@ -50,51 +47,10 @@ static void load_plugin(PyObject *globals, char *path, const char *name)
         free(load);
 }
 
-static int load_plugins(PyObject *globals, char *path)
-{
-        struct dirent *dent;
-        struct stat st;
-        DIR *dir;
-        int ret;
-
-        ret = stat(path, &st);
-        if (ret < 0)
-                return -1;
-
-        if (!S_ISDIR(st.st_mode))
-                return -1;
-
-        dir = opendir(path);
-        if (!dir)
-                return -1;
-
-        while ((dent = readdir(dir))) {
-                const char *name = dent->d_name;
-
-                if (fnmatch("*.py", name, FNM_PERIOD))
-                        continue;
-
-                load_plugin(globals, path, name);
-        }
-
-        closedir(dir);
-
-        return 0;
-}
-
-#define LOCAL_PLUGIN_DIR        ".trace-cmd/python"
-
 int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
 {
-        char *home;
-        char *path;
-        int ret;
         PyObject *globals, *m, *py_pevent, *str;
 
-        home = getenv("HOME");
-        if (!home)
-                return 0;
-
         Py_Initialize();
 
         m = PyImport_AddModule("__main__");
@@ -114,19 +70,9 @@ int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
         Py_DECREF(py_pevent);
         Py_DECREF(str);
 
-        path = malloc(strlen(home) + strlen(LOCAL_PLUGIN_DIR) + 2);
-        if (!path)
-                return -1;
+        trace_util_load_plugins(pevent, ".py", load_plugin, globals);
 
-        strcpy(path, home);
-        strcat(path, "/");
-        strcat(path, LOCAL_PLUGIN_DIR);
-
-        ret = load_plugins(globals, path);
-
-        free(path);
-
-        return ret;
+        return 0;
 }
 
 int PEVENT_PLUGIN_UNLOADER(void)
diff --git a/trace-cmd.h b/trace-cmd.h
index 643d394..83e7a34 100644
--- a/trace-cmd.h
+++ b/trace-cmd.h
@@ -152,5 +152,12 @@ int tracecmd_start_recording(struct tracecmd_recorder *recorder, unsigned long s
 void tracecmd_stop_recording(struct tracecmd_recorder *recorder);
 void tracecmd_stat_cpu(struct trace_seq *s, int cpu);
 
+/* --- Plugin handling --- */
+void trace_util_load_plugins(struct pevent *pevent, const char *suffix,
+                             void (*load_plugin)(struct pevent *pevent,
+                                                 const char *path,
+                                                 const char *name,
+                                                 void *data),
+                             void *data);
 
 #endif /* _TRACE_CMD_H */
diff --git a/trace-util.c b/trace-util.c
index 6007fb8..fba6a8d 100644
--- a/trace-util.c
+++ b/trace-util.c
@@ -196,15 +196,14 @@ void parse_ftrace_printk(struct pevent *pevent,
         }
 }
 
-static struct plugin_list *
-load_plugin(struct pevent *pevent, struct plugin_list *plugin_list,
-            const char *path, const char *file)
+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;
         char *plugin;
         void *handle;
-        int ret = -1;
 
         plugin = malloc_or_die(strlen(path) + strlen(file) + 2);
 
@@ -227,20 +226,17 @@ load_plugin(struct pevent *pevent, struct plugin_list *plugin_list,
         }
 
         list = malloc_or_die(sizeof(*list));
-        list->next = plugin_list;
+        list->next = *plugin_list;
         list->handle = handle;
         list->name = plugin;
-        plugin_list = list;
+        *plugin_list = list;
 
         pr_stat("registering plugin: %s", plugin);
-        ret = func(pevent);
-
-        return plugin_list;
+        func(pevent);
+        return;
 
  out_free:
         free(plugin);
-
-        return plugin_list;
 }
 
 static int mount_debugfs(void)
@@ -298,8 +294,14 @@ char *tracecmd_find_tracing_dir(void)
         return tracing_dir;
 }
 
-static int load_plugins(struct pevent *pevent, struct plugin_list **list,
-                        char *path)
+static void
+trace_util_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;
@@ -308,14 +310,14 @@ static int load_plugins(struct pevent *pevent, struct plugin_list **list,
 
         ret = stat(path, &st);
         if (ret < 0)
-                return -1;
+                return;
 
         if (!S_ISDIR(st.st_mode))
-                return -1;
+                return;
 
         dir = opendir(path);
         if (!dir)
-                return -1;
+                return;
 
         while ((dent = readdir(dir))) {
                 const char *name = dent->d_name;
@@ -324,38 +326,43 @@ static int load_plugins(struct pevent *pevent, struct plugin_list **list,
                     strcmp(name, "..") == 0)
                         continue;
 
-                /* Only load plugins that end in '.so' */
-                if (strcmp(name + (strlen(name) - 3), ".so") != 0)
+                /* Only load plugins that end in suffix */
+                if (strcmp(name + (strlen(name) - strlen(suffix)), suffix) != 0)
                         continue;
 
-                *list = load_plugin(pevent, *list, path, name);
+                load_plugin(pevent, path, name, data);
         }
 
         closedir(dir);
 
-        return 0;
+        return;
 }
 
-struct plugin_list *tracecmd_load_plugins(struct pevent *pevent)
+void trace_util_load_plugins(struct pevent *pevent, const char *suffix,
+                             void (*load_plugin)(struct pevent *pevent,
+                                                 const char *path,
+                                                 const char *name,
+                                                 void *data),
+                             void *data)
 {
-        struct plugin_list *list = NULL;
         char *home;
         char *path;
 
         if (tracecmd_disable_plugins)
-                return NULL;
+                return;
 
 /* If a system plugin directory was defined, check that first */
 #ifdef PLUGIN_DIR
         if (!tracecmd_disable_sys_plugins)
-                load_plugins(pevent, &list, MAKE_STR(PLUGIN_DIR));
+                trace_util_load_plugins_dir(pevent, suffix, MAKE_STR(PLUGIN_DIR),
+                                            load_plugin, data);
 #endif
 
         /* Now let the home directory override the system defaults */
         home = getenv("HOME");
 
         if (!home)
-                return list;
+                return;
 
         path = malloc_or_die(strlen(home) + strlen(LOCAL_PLUGIN_DIR) + 2);
 
@@ -363,9 +370,16 @@ struct plugin_list *tracecmd_load_plugins(struct pevent *pevent)
         strcat(path, "/");
         strcat(path, LOCAL_PLUGIN_DIR);
 
-        load_plugins(pevent, &list, path);
+        trace_util_load_plugins_dir(pevent, suffix, path, load_plugin, data);
 
         free(path);
+}
+
+struct plugin_list *tracecmd_load_plugins(struct pevent *pevent)
+{
+        struct plugin_list *list = NULL;
+
+        trace_util_load_plugins(pevent, ".so", load_plugin, &list);
 
         return list;
 }