cli: fix bt_plugin leak when using `-i ctf`

[babeltrace.git] / src / cli / babeltrace2-plugins.c

diff --git a/src/cli/babeltrace2-plugins.c b/src/cli/babeltrace2-plugins.c
index 09ca6dc69c9080be792564886f4404da637efff8..223f09ad39b06ed5be9defc04ea4236a2bd520b6 100644 (file)
--- a/src/cli/babeltrace2-plugins.c
+++ b/src/cli/babeltrace2-plugins.c
@@ -22,11 +22,12 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_TAG "CLI"
+#define BT_LOG_TAG "CLI/PLUGINS"
 #include "logging.h"
 
 #include "babeltrace2-plugins.h"
 
+#include <stdbool.h>
 #include <babeltrace2/babeltrace.h>
 
 /* Array of bt_plugin * */
@@ -43,7 +44,7 @@ void fini_loaded_plugins(void)
        g_ptr_array_free(loaded_plugins, TRUE);
 }
 
-const bt_plugin *find_loaded_plugin(const char *name)
+const bt_plugin *borrow_loaded_plugin_by_name(const char *name)
 {
        int i;
        const bt_plugin *plugin = NULL;
@@ -68,7 +69,6 @@ const bt_plugin *find_loaded_plugin(const char *name)
                BT_LOGI("Cannot find plugin: name=\"%s\"", name);
        }
 
-       bt_plugin_get_ref(plugin);
        return plugin;
 }
 
@@ -77,7 +77,12 @@ size_t get_loaded_plugins_count(void)
        return loaded_plugins->len;
 }
 
-const bt_plugin *borrow_loaded_plugin(size_t index)
+const bt_plugin **borrow_loaded_plugins(void)
+{
+       return (const bt_plugin **) loaded_plugins->pdata;
+}
+
+const bt_plugin *borrow_loaded_plugin_by_index(size_t index)
 {
        BT_ASSERT(index < loaded_plugins->len);
        return g_ptr_array_index(loaded_plugins, index);
@@ -96,7 +101,7 @@ void add_to_loaded_plugins(const bt_plugin_set *plugin_set)
                const bt_plugin *plugin =
                        bt_plugin_set_borrow_plugin_by_index_const(plugin_set, i);
                const bt_plugin *loaded_plugin =
-                       find_loaded_plugin(bt_plugin_get_name(plugin));
+                       borrow_loaded_plugin_by_name(bt_plugin_get_name(plugin));
 
                BT_ASSERT(plugin);
 
@@ -107,7 +112,6 @@ void add_to_loaded_plugins(const bt_plugin_set *plugin_set)
                                bt_plugin_get_name(plugin),
                                bt_plugin_get_path(plugin),
                                bt_plugin_get_path(loaded_plugin));
-                       bt_plugin_put_ref(loaded_plugin);
                } else {
                        /* Add to global array. */
                        BT_LOGD("Adding plugin to loaded plugins: plugin-path=\"%s\"",
@@ -123,11 +127,9 @@ int load_dynamic_plugins(const bt_value *plugin_paths)
 {
        int nr_paths, i, ret = 0;
 
-       nr_paths = bt_value_array_get_size(plugin_paths);
-       if (nr_paths < 0) {
-               BT_CLI_LOGE_APPEND_CAUSE(
-                       "Cannot load dynamic plugins: no plugin path.");
-               ret = -1;
+       nr_paths = bt_value_array_get_length(plugin_paths);
+       if (nr_paths == 0) {
+               BT_LOGI_STR("No dynamic plugin path.");
                goto end;
        }
 
@@ -156,11 +158,13 @@ int load_dynamic_plugins(const bt_value *plugin_paths)
                }
 
                status = bt_plugin_find_all_from_dir(plugin_path, BT_FALSE,
-                       BT_FALSE, &plugin_set);
+                       BT_TRUE, &plugin_set);
                if (status < 0) {
-                       BT_LOGE("Unable to load dynamic plugins from directory: "
+                       BT_CLI_LOGE_APPEND_CAUSE(
+                               "Unable to load dynamic plugins from directory: "
                                "path=\"%s\"", plugin_path);
-                       continue;
+                       ret = status;
+                       goto end;
                } else if (status ==
                                BT_PLUGIN_FIND_ALL_FROM_DIR_STATUS_NOT_FOUND) {
                        BT_LOGI("No plugins found in directory: path=\"%s\"",
@@ -205,7 +209,7 @@ end:
        return ret;
 }
 
-int load_all_plugins(const bt_value *plugin_paths)
+int require_loaded_plugins(const bt_value *plugin_paths)
 {
        static bool loaded = false;
        static int ret = 0;