X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fcli%2Fbabeltrace2-plugins.c;h=4556e6bcc1bcb5df96e1e2300835f6685314f69d;hp=09ca6dc69c9080be792564886f4404da637efff8;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=743138a3cca9770e8fae3f1399df20d087b378f2

diff --git a/src/cli/babeltrace2-plugins.c b/src/cli/babeltrace2-plugins.c
index 09ca6dc6..4556e6bc 100644
--- a/src/cli/babeltrace2-plugins.c
+++ b/src/cli/babeltrace2-plugins.c
@@ -1,32 +1,17 @@
 /*
- * Babeltrace trace converter - CLI tool's configuration
+ * SPDX-License-Identifier: MIT
  *
  * Copyright 2016-2019 EfficiOS Inc.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Babeltrace trace converter - CLI tool's configuration
  */
 
-#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 +28,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 +53,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 +61,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 +85,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 +96,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 +111,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 +142,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 +193,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;