X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=9a5af9fb01efa436dc1f0604de83df2f1a0e886a;hb=5a3ee633fdd379e8acf7535f0ba91fb05234a36a;hp=02ac48531a39ee29b88d4fa24bfc1235642d1a67;hpb=d71dcf2c09c27291afa19a40eb99cc3556842e99;p=babeltrace.git

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 02ac4853..9a5af9fb 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -140,9 +140,14 @@ void print_component_classes_found(void)
 	for (i = 0; i < plugins_count; i++) {
 		int j;
 		struct bt_plugin *plugin = g_ptr_array_index(loaded_plugins, i);
+		unsigned int major, minor, patch;
+		const char *extra;
+		enum bt_plugin_status version_status;
 
 		component_classes_count =
 			bt_plugin_get_component_class_count(plugin);
+		version_status = bt_plugin_get_version(plugin, &major, &minor,
+			&patch, &extra);
 
 		for (j = 0; j < component_classes_count; j++) {
 			struct bt_component_class *comp_class =
@@ -169,6 +174,18 @@ void print_component_classes_found(void)
 				license ? license : "Unknown");
 			printf_verbose("\tplugin description: %s\n",
 				plugin_description ? plugin_description : "None");
+
+			if (version_status == BT_PLUGIN_STATUS_OK) {
+				printf_verbose("\tplugin version: %u.%u.%u",
+					major, minor, patch);
+
+				if (extra) {
+					printf("%s", extra);
+				}
+
+				printf("\n");
+			}
+
 			printf_verbose("\tcomponent description: %s\n",
 				comp_class_description ? comp_class_description : "None");
 			bt_put(comp_class);
@@ -383,7 +400,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;
@@ -411,7 +428,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;
@@ -480,7 +497,7 @@ int load_dynamic_plugins(struct bt_config *cfg)
 			continue;
 		}
 
-		plugins = bt_plugin_create_all_from_dir(plugin_path, true);
+		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);