X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=ddb3b0ee5d15a8bd72fdd9939a9423fe7a9e57e9;hb=22e224622e936c4eba550405f5631c5297c165be;hp=f969f8d73cc0d728ea4d373d932d820d3b0b2b22;hpb=98ecef3256466e76ec8b0936ab1b7da3fa3a2c3f;p=babeltrace.git

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index f969f8d7..ddb3b0ee 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -27,10 +27,14 @@
  */
 
 #include <babeltrace/babeltrace.h>
-#include <babeltrace/plugin/component-factory.h>
 #include <babeltrace/plugin/plugin.h>
-#include <babeltrace/plugin/component-class.h>
-#include <babeltrace/plugin/notification/iterator.h>
+#include <babeltrace/common-internal.h>
+#include <babeltrace/component/component.h>
+#include <babeltrace/component/component-source.h>
+#include <babeltrace/component/component-sink.h>
+#include <babeltrace/component/component-filter.h>
+#include <babeltrace/component/component-class.h>
+#include <babeltrace/component/notification/iterator.h>
 #include <babeltrace/ref.h>
 #include <babeltrace/values.h>
 #include <stdlib.h>
@@ -38,75 +42,60 @@
 #include <popt.h>
 #include <string.h>
 #include <stdio.h>
+#include <glib.h>
 #include "babeltrace-cfg.h"
+#include "default-cfg.h"
 
-static struct bt_component_factory *component_factory;
+GPtrArray *loaded_plugins;
 
 static
-const char *component_type_str(enum bt_component_type type)
+void init_loaded_plugins_array(void)
 {
-	switch (type) {
-	case BT_COMPONENT_TYPE_SOURCE:
-		return "source";
-	case BT_COMPONENT_TYPE_SINK:
-		return "sink";
-	case BT_COMPONENT_TYPE_FILTER:
-		return "filter";
-	case BT_COMPONENT_TYPE_UNKNOWN:
-	default:
-		return "unknown";
-	}
+	loaded_plugins = g_ptr_array_new_full(8, bt_put);
 }
 
 static
-void print_component_classes_found(struct bt_component_factory *factory)
+void fini_loaded_plugins_array(void)
 {
-	int count, i;
+	g_ptr_array_free(loaded_plugins, TRUE);
+}
 
-	if (!babeltrace_verbose) {
-		return;
-	}
+static
+struct bt_plugin *find_plugin(const char *name)
+{
+	int i;
+	struct bt_plugin *plugin = NULL;
 
-	count = bt_component_factory_get_component_class_count(factory);
-	if (count <= 0) {
-		fprintf(stderr, "No component classes found. Please make sure your plug-in search path is set correctly.\n");
-		return;
+	for (i = 0; i < loaded_plugins->len; i++) {
+		plugin = g_ptr_array_index(loaded_plugins, i);
+
+		if (strcmp(name, bt_plugin_get_name(plugin)) == 0) {
+			break;
+		}
+
+		plugin = NULL;
 	}
 
-	printf_verbose("Found %d component classes.\n", count);
-	for (i = 0; i < count; i++) {
-		struct bt_component_class *component_class =
-				bt_component_factory_get_component_class_index(
-				factory, i);
-		struct bt_plugin *plugin = bt_component_class_get_plugin(
-				component_class);
-		const char *plugin_name = bt_plugin_get_name(plugin);
-		const char *component_name = bt_component_class_get_name(
-				component_class);
-		const char *path = bt_plugin_get_path(plugin);
-		const char *author = bt_plugin_get_author(plugin);
-		const char *license = bt_plugin_get_license(plugin);
-		const char *plugin_description = bt_plugin_get_description(
-				plugin);
-		const char *component_description =
-				bt_component_class_get_description(
-					component_class);
-		enum bt_component_type type = bt_component_class_get_type(
-				component_class);
-
-		printf_verbose("[%s - %s (%s)]\n", plugin_name, component_name,
-			       component_type_str(type));
-		printf_verbose("\tpath: %s\n", path ? path : "None");
-		printf_verbose("\tauthor: %s\n", author ? author : "Unknown");
-		printf_verbose("\tlicense: %s\n", license ? license : "Unknown");
-		printf_verbose("\tplugin description: %s\n",
-				plugin_description ? plugin_description : "None");
-		printf_verbose("\tcomponent description: %s\n",
-				component_description ? component_description : "None");
-
-		bt_put(plugin);
-		bt_put(component_class);
+	return bt_get(plugin);
+}
+
+static
+struct bt_component_class *find_component_class(const char *plugin_name,
+		const char *comp_class_name,
+		enum bt_component_class_type comp_class_type)
+{
+	struct bt_component_class *comp_class = NULL;
+	struct bt_plugin *plugin = find_plugin(plugin_name);
+
+	if (!plugin) {
+		goto end;
 	}
+
+	comp_class = bt_plugin_get_component_class_by_name_and_type(plugin,
+			comp_class_name, comp_class_type);
+	BT_PUT(plugin);
+end:
+	return comp_class;
 }
 
 static
@@ -120,22 +109,39 @@ void print_indent(size_t indent)
 }
 
 static
-void print_value(struct bt_value *, size_t, bool);
+void print_value(struct bt_value *, size_t);
 
 static
 bool print_map_value(const char *key, struct bt_value *object, void *data)
 {
-	size_t indent = (size_t) data;
+	size_t *indent = data;
 
-	print_indent(indent);
-	printf("\"%s\": ", key);
-	print_value(object, indent, false);
+	print_indent(*indent);
+	printf("%s: ", key);
 
+	if (bt_value_is_array(object) &&
+			bt_value_array_is_empty(object)) {
+		printf("[ ]\n");
+		return true;
+	}
+
+	if (bt_value_is_map(object) &&
+			bt_value_map_is_empty(object)) {
+		printf("{ }\n");
+		return true;
+	}
+
+	if (bt_value_is_array(object) ||
+			bt_value_is_map(object)) {
+		printf("\n");
+	}
+
+	print_value(object, *indent + 2);
 	return true;
 }
 
 static
-void print_value(struct bt_value *value, size_t indent, bool do_indent)
+void print_value(struct bt_value *value, size_t indent)
 {
 	bool bool_val;
 	int64_t int_val;
@@ -148,17 +154,13 @@ void print_value(struct bt_value *value, size_t indent, bool do_indent)
 		return;
 	}
 
-	if (do_indent) {
-		print_indent(indent);
-	}
-
 	switch (bt_value_get_type(value)) {
 	case BT_VALUE_TYPE_NULL:
 		printf("null\n");
 		break;
 	case BT_VALUE_TYPE_BOOL:
 		bt_value_bool_get(value, &bool_val);
-		printf("%s\n", bool_val ? "true" : "false");
+		printf("%s\n", bool_val ? "yes" : "no");
 		break;
 	case BT_VALUE_TYPE_INTEGER:
 		bt_value_integer_get(value, &int_val);
@@ -170,34 +172,55 @@ void print_value(struct bt_value *value, size_t indent, bool do_indent)
 		break;
 	case BT_VALUE_TYPE_STRING:
 		bt_value_string_get(value, &str_val);
-		printf("\"%s\"\n", str_val);
+		printf("%s\n", str_val);
 		break;
 	case BT_VALUE_TYPE_ARRAY:
 		size = bt_value_array_size(value);
-		printf("[\n");
+		assert(size >= 0);
+
+		if (size == 0) {
+			print_indent(indent);
+			printf("[ ]\n");
+			break;
+		}
 
 		for (i = 0; i < size; i++) {
 			struct bt_value *element =
 					bt_value_array_get(value, i);
 
-			print_value(element, indent + 2, true);
+			assert(element);
+			print_indent(indent);
+			printf("- ");
+
+			if (bt_value_is_array(element) &&
+					bt_value_array_is_empty(element)) {
+				printf("[ ]\n");
+				continue;
+			}
+
+			if (bt_value_is_map(element) &&
+					bt_value_map_is_empty(element)) {
+				printf("{ }\n");
+				continue;
+			}
+
+			if (bt_value_is_array(element) ||
+					bt_value_is_map(element)) {
+				printf("\n");
+			}
+
+			print_value(element, indent + 2);
 			BT_PUT(element);
 		}
-
-		print_indent(indent);
-		printf("]\n");
 		break;
 	case BT_VALUE_TYPE_MAP:
 		if (bt_value_map_is_empty(value)) {
-			printf("{}\n");
-			return;
+			print_indent(indent);
+			printf("{ }\n");
+			break;
 		}
 
-		printf("{\n");
-		bt_value_map_foreach(value, print_map_value,
-			(void *) (indent + 2));
-		print_indent(indent);
-		printf("}\n");
+		bt_value_map_foreach(value, print_map_value, &indent);
 		break;
 	default:
 		assert(false);
@@ -207,10 +230,10 @@ void print_value(struct bt_value *value, size_t indent, bool do_indent)
 static
 void print_bt_config_component(struct bt_config_component *bt_config_component)
 {
-	printf("  %s.%s\n", bt_config_component->plugin_name->str,
+	printf("    %s.%s:\n", bt_config_component->plugin_name->str,
 		bt_config_component->component_name->str);
-	printf("    params:\n");
-	print_value(bt_config_component->params, 6, true);
+	printf("      Parameters:\n");
+	print_value(bt_config_component->params, 8);
 }
 
 static
@@ -226,19 +249,52 @@ void print_bt_config_components(GPtrArray *array)
 	}
 }
 
+static
+void print_plugin_paths(struct bt_value *plugin_paths)
+{
+	printf("  Plugin paths:\n");
+	print_value(plugin_paths, 4);
+}
+
+static
+void print_cfg_convert(struct bt_config *cfg)
+{
+	printf("  Force correlate: %s\n",
+		cfg->cmd_data.convert.force_correlate ? "yes" : "no");
+	print_plugin_paths(cfg->cmd_data.convert.plugin_paths);
+	printf("  Source component instances:\n");
+	print_bt_config_components(cfg->cmd_data.convert.sources);
+	printf("  Sink component instances:\n");
+	print_bt_config_components(cfg->cmd_data.convert.sinks);
+}
+
+static
+void print_cfg_list_plugins(struct bt_config *cfg)
+{
+	print_plugin_paths(cfg->cmd_data.list_plugins.plugin_paths);
+}
+
 static
 void print_cfg(struct bt_config *cfg)
 {
-	printf("debug:           %d\n", cfg->debug);
-	printf("verbose:         %d\n", cfg->verbose);
-	printf("do list:         %d\n", cfg->do_list);
-	printf("force correlate: %d\n", cfg->force_correlate);
-	printf("plugin paths:\n");
-	print_value(cfg->plugin_paths, 2, true);
-	printf("sources:\n");
-	print_bt_config_components(cfg->sources);
-	printf("sinks:\n");
-	print_bt_config_components(cfg->sinks);
+	if (!babeltrace_verbose) {
+		return;
+	}
+
+	printf("Configuration:\n");
+	printf("  Debug mode: %s\n", cfg->debug ? "yes" : "no");
+	printf("  Verbose mode: %s\n", cfg->verbose ? "yes" : "no");
+
+	switch (cfg->command) {
+	case BT_CONFIG_COMMAND_CONVERT:
+		print_cfg_convert(cfg);
+		break;
+	case BT_CONFIG_COMMAND_LIST_PLUGINS:
+		print_cfg_list_plugins(cfg);
+		break;
+	default:
+		assert(false);
+	}
 }
 
 static
@@ -249,7 +305,6 @@ struct bt_component *create_trimmer(struct bt_config_component *source_cfg)
 	struct bt_value *trimmer_params = NULL;
 	struct bt_value *value;
 
-	assert(component_factory);
 	trimmer_params = bt_value_map_create();
 	if (!trimmer_params) {
 		goto end;
@@ -289,9 +344,8 @@ struct bt_component *create_trimmer(struct bt_config_component *source_cfg)
 		}
 	}
 
-	trimmer_class = bt_component_factory_get_component_class(
-			component_factory, "utils", BT_COMPONENT_TYPE_FILTER,
-			"trimmer");
+	trimmer_class = find_component_class("utils", "trimmer",
+		BT_COMPONENT_CLASS_TYPE_FILTER);
 	if (!trimmer_class) {
 		fprintf(stderr, "Could not find trimmer component class. Aborting...\n");
 		goto end;
@@ -318,7 +372,7 @@ int connect_source_sink(struct bt_component *source,
 	struct bt_notification_iterator *source_it = NULL;
 	struct bt_notification_iterator *to_sink_it = NULL;
 
-	source_it = bt_component_source_create_iterator(source);
+	source_it = bt_component_source_create_notification_iterator(source);
 	if (!source_it) {
 		fprintf(stderr, "Failed to instantiate source iterator. Aborting...\n");
                 ret = -1;
@@ -346,7 +400,7 @@ int connect_source_sink(struct bt_component *source,
 			goto end;
 		}
 
-		to_sink_it = bt_component_filter_create_iterator(trimmer);
+		to_sink_it = bt_component_filter_create_notification_iterator(trimmer);
 		if (!to_sink_it) {
 			fprintf(stderr, "Failed to instantiate trimmer iterator. Aborting...\n");
 			ret = -1;
@@ -369,91 +423,401 @@ end:
 	return ret;
 }
 
-static int load_plugins(struct bt_config *cfg)
+static
+void add_to_loaded_plugins(struct bt_plugin **plugins)
 {
-	int nr_paths, i;
+	while (*plugins) {
+		struct bt_plugin *plugin = *plugins;
+		/* Check if it's already loaded (from another path). */
+		struct bt_plugin *loaded_plugin =
+				find_plugin(bt_plugin_get_name(plugin));
+
+		if (loaded_plugin) {
+			printf_verbose("Not loading plugin `%s`: already loaded from `%s`\n",
+					bt_plugin_get_path(plugin),
+					bt_plugin_get_path(loaded_plugin));
+			BT_PUT(loaded_plugin);
+			BT_PUT(plugin);
+		} else {
+			/* Transfer ownership to global array. */
+			g_ptr_array_add(loaded_plugins, plugin);
+		}
+		*(plugins++) = NULL;
+	}
+}
 
-	nr_paths = bt_value_array_size(cfg->plugin_paths);
+static
+int load_dynamic_plugins(struct bt_value *plugin_paths)
+{
+	int nr_paths, i, ret = 0;
+
+	nr_paths = bt_value_array_size(plugin_paths);
 	if (nr_paths < 0) {
-		return -1;
+		ret = -1;
+		goto end;
 	}
+
 	for (i = 0; i < nr_paths; i++) {
 		struct bt_value *plugin_path_value = NULL;
 		const char *plugin_path;
+		struct bt_plugin **plugins;
 
-		plugin_path_value = bt_value_array_get(cfg->plugin_paths, i);
+		plugin_path_value = bt_value_array_get(plugin_paths, i);
 		if (bt_value_string_get(plugin_path_value,
 				&plugin_path)) {
 			BT_PUT(plugin_path_value);
 			continue;
 		}
-		if (bt_component_factory_load_recursive(component_factory,
-				plugin_path)) {
+
+		plugins = bt_plugin_create_all_from_dir(plugin_path, false);
+		if (!plugins) {
 			printf_debug("Unable to dynamically load plugins from path %s.\n",
 				plugin_path);
+			BT_PUT(plugin_path_value);
+			continue;
 		}
+
+		add_to_loaded_plugins(plugins);
+		free(plugins);
+
 		BT_PUT(plugin_path_value);
 	}
-	return 0;
+end:
+	return ret;
 }
 
-int main(int argc, const char **argv)
+static
+int load_static_plugins(void)
 {
-	int ret;
-	struct bt_component_class *source_class = NULL;
-	struct bt_component_class *sink_class = NULL;
-	struct bt_component *source = NULL, *sink = NULL;
-	struct bt_value *source_params = NULL, *sink_params = NULL;
-	struct bt_config *cfg;
-	enum bt_component_status sink_status;
-	struct bt_config_component *source_cfg = NULL, *sink_cfg = NULL;
+	int ret = 0;
+	struct bt_plugin **plugins;
 
-	cfg = bt_config_from_args(argc, argv, &ret);
-	if (cfg) {
-		print_cfg(cfg);
-	} else {
+	plugins = bt_plugin_create_all_from_static();
+	if (!plugins) {
+		printf_debug("Unable to load static plugins.\n");
+		ret = -1;
 		goto end;
 	}
 
-	babeltrace_verbose = cfg->verbose;
-	babeltrace_debug = cfg->debug;
+	add_to_loaded_plugins(plugins);
+	free(plugins);
+end:
+	return ret;
+}
 
-	/* TODO handle more than 1 source and 1 sink. */
-	if (cfg->sources->len != 1 || cfg->sinks->len != 1) {
-		fprintf(stderr, "Unexpected configuration, aborting...\n");
+static
+const char *component_type_str(enum bt_component_class_type type)
+{
+	switch (type) {
+	case BT_COMPONENT_CLASS_TYPE_SOURCE:
+		return "source";
+	case BT_COMPONENT_CLASS_TYPE_SINK:
+		return "sink";
+	case BT_COMPONENT_CLASS_TYPE_FILTER:
+		return "filter";
+	case BT_COMPONENT_CLASS_TYPE_UNKNOWN:
+	default:
+		return "unknown";
+	}
+}
+
+static int load_all_plugins(struct bt_value *plugin_paths)
+{
+	int ret = 0;
+
+	if (load_dynamic_plugins(plugin_paths)) {
+		fprintf(stderr, "Failed to load dynamic plugins.\n");
 		ret = -1;
 		goto end;
 	}
 
-	printf_verbose("Verbose mode active.\n");
-	printf_debug("Debug mode active.\n");
-	component_factory = bt_component_factory_create();
-	if (!component_factory) {
-		fprintf(stderr, "Failed to create component factory.\n");
+	if (load_static_plugins()) {
+		fprintf(stderr, "Failed to load static plugins.\n");
 		ret = -1;
 		goto end;
 	}
 
-	if (load_plugins(cfg)) {
-		fprintf(stderr, "Failed to load plugins.\n");
+end:
+	return ret;
+}
+
+static void print_plugin_info(struct bt_plugin *plugin)
+{
+	unsigned int major, minor, patch;
+	const char *extra;
+	enum bt_plugin_status version_status;
+	const char *plugin_name;
+	const char *path;
+	const char *author;
+	const char *license;
+	const char *plugin_description;
+
+	plugin_name = bt_plugin_get_name(plugin);
+	path = bt_plugin_get_path(plugin);
+	author = bt_plugin_get_author(plugin);
+	license = bt_plugin_get_license(plugin);
+	plugin_description = bt_plugin_get_description(plugin);
+	version_status = bt_plugin_get_version(plugin, &major, &minor,
+		&patch, &extra);
+	printf("%s%s%s%s:\n", bt_common_color_bold(),
+		bt_common_color_fg_blue(), plugin_name,
+		bt_common_color_reset());
+	printf("  %sPath%s: %s\n", bt_common_color_bold(),
+		bt_common_color_reset(), path ? path : "(None)");
+
+	if (version_status == BT_PLUGIN_STATUS_OK) {
+		printf("  %sVersion%s: %u.%u.%u",
+			bt_common_color_bold(), bt_common_color_reset(),
+			major, minor, patch);
+
+		if (extra) {
+			printf("%s", extra);
+		}
+
+		printf("\n");
+	}
+
+	printf("  %sDescription%s: %s\n", bt_common_color_bold(),
+		bt_common_color_reset(),
+		plugin_description ? plugin_description : "(None)");
+	printf("  %sAuthor%s: %s\n", bt_common_color_bold(),
+		bt_common_color_reset(), author ? author : "(Unknown)");
+	printf("  %sLicense%s: %s\n", bt_common_color_bold(),
+		bt_common_color_reset(),
+		license ? license : "(Unknown)");
+}
+
+static void print_plugin_comp_cls_opt(FILE *fh, const char *plugin_name,
+		const char *comp_cls_name, enum bt_component_class_type type)
+{
+	fprintf(fh, "%s%s--%s%s %s%s%s.%s%s%s",
+		bt_common_color_bold(),
+		bt_common_color_fg_cyan(),
+		component_type_str(type),
+		bt_common_color_fg_default(),
+		bt_common_color_fg_blue(),
+		plugin_name,
+		bt_common_color_fg_default(),
+		bt_common_color_fg_yellow(),
+		comp_cls_name,
+		bt_common_color_reset());
+}
+
+static int cmd_help(struct bt_config *cfg)
+{
+	int ret;
+	struct bt_plugin *plugin = NULL;
+	size_t i;
+
+	ret = load_all_plugins(cfg->cmd_data.list_plugins.plugin_paths);
+	if (ret) {
+		goto end;
+	}
+
+	plugin = find_plugin(cfg->cmd_data.help.plugin_name->str);
+	if (!plugin) {
+		fprintf(stderr, "%s%sCannot find plugin %s%s%s\n",
+			bt_common_color_bold(), bt_common_color_fg_red(),
+			bt_common_color_fg_blue(),
+			cfg->cmd_data.help.plugin_name->str,
+			bt_common_color_reset());
 		ret = -1;
 		goto end;
 	}
 
-	ret = bt_component_factory_load_static(component_factory);
+	print_plugin_info(plugin);
+	printf("  %sComponent classes%s: %d\n",
+			bt_common_color_bold(),
+			bt_common_color_reset(),
+			bt_plugin_get_component_class_count(plugin));
+
+
+	if (cfg->cmd_data.help.comp_cls_type !=
+			BT_COMPONENT_CLASS_TYPE_UNKNOWN) {
+		struct bt_component_class *needed_comp_cls =
+			find_component_class(
+				cfg->cmd_data.help.plugin_name->str,
+				cfg->cmd_data.help.component_name->str,
+				cfg->cmd_data.help.comp_cls_type);
+
+		if (!needed_comp_cls) {
+			fprintf(stderr, "\n%s%sCannot find component class %s",
+				bt_common_color_bold(),
+				bt_common_color_fg_red(),
+				bt_common_color_reset());
+			print_plugin_comp_cls_opt(stderr,
+				cfg->cmd_data.help.plugin_name->str,
+				cfg->cmd_data.help.component_name->str,
+				cfg->cmd_data.help.comp_cls_type);
+			fprintf(stderr, "\n");
+			ret = -1;
+			goto end;
+		}
+
+		bt_put(needed_comp_cls);
+	}
+
+	for (i = 0; i < bt_plugin_get_component_class_count(plugin); i++) {
+		struct bt_component_class *comp_cls =
+			bt_plugin_get_component_class(plugin, i);
+		const char *comp_class_name =
+			bt_component_class_get_name(comp_cls);
+		const char *comp_class_description =
+			bt_component_class_get_description(comp_cls);
+		const char *comp_class_help =
+			bt_component_class_get_help(comp_cls);
+		enum bt_component_class_type type =
+			bt_component_class_get_type(comp_cls);
+
+		assert(comp_cls);
+
+		if (cfg->cmd_data.help.comp_cls_type !=
+				BT_COMPONENT_CLASS_TYPE_UNKNOWN) {
+			if (strcmp(cfg->cmd_data.help.component_name->str,
+					comp_class_name) != 0 &&
+					type ==
+					cfg->cmd_data.help.comp_cls_type) {
+				bt_put(comp_cls);
+				continue;
+			}
+		}
+
+		printf("\n");
+		print_plugin_comp_cls_opt(stdout,
+			cfg->cmd_data.help.plugin_name->str,
+			comp_class_name,
+			type);
+		printf("\n");
+		printf("  %sDescription%s: %s\n", bt_common_color_bold(),
+			bt_common_color_reset(),
+			comp_class_description ? comp_class_description : "(None)");
+
+		if (comp_class_help) {
+			printf("\n%s\n", comp_class_help);
+		}
+
+		bt_put(comp_cls);
+	}
+
+end:
+	bt_put(plugin);
+	return ret;
+}
+
+static int cmd_list_plugins(struct bt_config *cfg)
+{
+	int ret;
+	int plugins_count, component_classes_count = 0, i;
+
+	ret = load_all_plugins(cfg->cmd_data.list_plugins.plugin_paths);
 	if (ret) {
-		fprintf(stderr, "Failed to load static plugins.\n");
 		goto end;
 	}
 
-	print_component_classes_found(component_factory);
+	printf("From the following plugin paths:\n\n");
+	print_value(cfg->cmd_data.list_plugins.plugin_paths, 2);
+	printf("\n");
+	plugins_count = loaded_plugins->len;
+	if (plugins_count == 0) {
+		fprintf(stderr, "%s%sNo plugins found.%s\n",
+			bt_common_color_bold(), bt_common_color_fg_red(),
+			bt_common_color_reset());
+		fprintf(stderr, "\n");
+		fprintf(stderr, "Please make sure your plugin search path is set correctly. You can use\n");
+		fprintf(stderr, "the --plugin-path command-line option or the BABELTRACE_PLUGIN_PATH\n");
+		fprintf(stderr, "environment variable.\n");
+		ret = -1;
+		goto end;
+	}
+
+	for (i = 0; i < plugins_count; i++) {
+		struct bt_plugin *plugin = g_ptr_array_index(loaded_plugins, i);
+
+		component_classes_count += bt_plugin_get_component_class_count(plugin);
+	}
+
+	printf("Found %s%d%s component classes in %s%d%s plugins.\n",
+		bt_common_color_bold(),
+		component_classes_count,
+		bt_common_color_reset(),
+		bt_common_color_bold(),
+		plugins_count,
+		bt_common_color_reset());
+
+	for (i = 0; i < plugins_count; i++) {
+		int j;
+		struct bt_plugin *plugin = g_ptr_array_index(loaded_plugins, i);
+
+		component_classes_count =
+			bt_plugin_get_component_class_count(plugin);
+		printf("\n");
+		print_plugin_info(plugin);
+
+		if (component_classes_count == 0) {
+			printf("  %sComponent classes%s: (None)\n",
+				bt_common_color_bold(),
+				bt_common_color_reset());
+		} else {
+			printf("  %sComponent classes%s:\n",
+				bt_common_color_bold(),
+				bt_common_color_reset());
+		}
+
+		for (j = 0; j < component_classes_count; j++) {
+			struct bt_component_class *comp_class =
+				bt_plugin_get_component_class(plugin, j);
+			const char *comp_class_name =
+				bt_component_class_get_name(comp_class);
+			const char *comp_class_description =
+				bt_component_class_get_description(comp_class);
+			enum bt_component_class_type type =
+				bt_component_class_get_type(comp_class);
+
+			printf("    ");
+			print_plugin_comp_cls_opt(stdout,
+				bt_plugin_get_name(plugin), comp_class_name,
+				type);
+
+			if (comp_class_description) {
+				printf(": %s", comp_class_description);
+			}
+
+			printf("\n");
+			bt_put(comp_class);
+		}
+	}
+
+end:
+	return ret;
+}
+
+static int cmd_convert(struct bt_config *cfg)
+{
+	int ret = 0;
+	struct bt_component_class *source_class = NULL;
+	struct bt_component_class *sink_class = NULL;
+	struct bt_component *source = NULL, *sink = NULL;
+	struct bt_value *source_params = NULL, *sink_params = NULL;
+	enum bt_component_status sink_status;
+	struct bt_config_component *source_cfg = NULL, *sink_cfg = NULL;
+
+	/* TODO handle more than 1 source and 1 sink. */
+	if (cfg->cmd_data.convert.sources->len != 1 ||
+			cfg->cmd_data.convert.sinks->len != 1) {
+		ret = -1;
+		goto end;
+	}
+
+	ret = load_all_plugins(cfg->cmd_data.convert.plugin_paths);
+	if (ret) {
+		goto end;
+	}
 
-	source_cfg = bt_config_get_component(cfg->sources, 0);
+	source_cfg = bt_config_get_component(cfg->cmd_data.convert.sources, 0);
 	source_params = bt_get(source_cfg->params);
-	source_class = bt_component_factory_get_component_class(
-			component_factory, source_cfg->plugin_name->str,
-			BT_COMPONENT_TYPE_SOURCE,
-			source_cfg->component_name->str);
+	source_class = find_component_class(source_cfg->plugin_name->str,
+			source_cfg->component_name->str,
+			BT_COMPONENT_CLASS_TYPE_SOURCE);
 	if (!source_class) {
 		fprintf(stderr, "Could not find %s.%s source component class. Aborting...\n",
 				source_cfg->plugin_name->str,
@@ -462,11 +826,11 @@ int main(int argc, const char **argv)
 		goto end;
 	}
 
-	sink_cfg = bt_config_get_component(cfg->sinks, 0);
+	sink_cfg = bt_config_get_component(cfg->cmd_data.convert.sinks, 0);
 	sink_params = bt_get(sink_cfg->params);
-	sink_class = bt_component_factory_get_component_class(component_factory,
-			sink_cfg->plugin_name->str, BT_COMPONENT_TYPE_SINK,
-			sink_cfg->component_name->str);
+	sink_class = find_component_class(sink_cfg->plugin_name->str,
+			sink_cfg->component_name->str,
+			BT_COMPONENT_CLASS_TYPE_SINK);
 	if (!sink_class) {
 		fprintf(stderr, "Could not find %s.%s output component class. Aborting...\n",
 				sink_cfg->plugin_name->str,
@@ -491,6 +855,7 @@ int main(int argc, const char **argv)
 
 	ret = connect_source_sink(source, source_cfg, sink);
 	if (ret) {
+		ret = -1;
 		goto end;
 	}
 
@@ -511,16 +876,84 @@ int main(int argc, const char **argv)
 			goto end;
 		}
 	}
+
 end:
-	BT_PUT(component_factory);
 	BT_PUT(sink_class);
 	BT_PUT(source_class);
 	BT_PUT(source);
 	BT_PUT(sink);
 	BT_PUT(source_params);
 	BT_PUT(sink_params);
-	BT_PUT(cfg);
 	BT_PUT(sink_cfg);
 	BT_PUT(source_cfg);
-	return ret ? 1 : 0;
+	return ret;
+}
+
+static void warn_command_name_and_directory_clash(struct bt_config *cfg)
+{
+	if (!cfg->command_name) {
+		return;
+	}
+
+	if (g_file_test(cfg->command_name,
+			G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
+		fprintf(stderr, "\nNOTE: The `%s` command was executed. If you meant to convert a\n",
+			cfg->command_name);
+		fprintf(stderr, "trace located in the local `%s` directory, please use:\n",
+			cfg->command_name);
+		fprintf(stderr, "\n");
+		fprintf(stderr, "    babeltrace convert %s [OPTIONS]\n",
+			cfg->command_name);
+	}
+}
+
+int main(int argc, const char **argv)
+{
+	int ret;
+	int retcode;
+	struct bt_config *cfg;
+
+	init_loaded_plugins_array();
+	cfg = bt_config_from_args_with_defaults(argc, argv, &retcode);
+
+	if (retcode < 0) {
+		/* Quit without errors; typically usage/version */
+		retcode = 0;
+		goto end;
+	}
+
+	if (retcode > 0) {
+		goto end;
+	}
+
+	if (!cfg) {
+		fprintf(stderr, "Failed to create Babeltrace configuration\n");
+		goto end;
+	}
+
+	babeltrace_debug = cfg->debug;
+	babeltrace_verbose = cfg->verbose;
+	print_cfg(cfg);
+
+	switch (cfg->command) {
+	case BT_CONFIG_COMMAND_CONVERT:
+		ret = cmd_convert(cfg);
+		break;
+	case BT_CONFIG_COMMAND_LIST_PLUGINS:
+		ret = cmd_list_plugins(cfg);
+		break;
+	case BT_CONFIG_COMMAND_HELP:
+		ret = cmd_help(cfg);
+		break;
+	default:
+		assert(false);
+	}
+
+	warn_command_name_and_directory_clash(cfg);
+	retcode = ret ? 1 : 0;
+
+end:
+	BT_PUT(cfg);
+	fini_loaded_plugins_array();
+	return retcode;
 }