X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=bc03826ca2ebc6eb050d90356065532c05f8a012;hb=e5bc7f813987de3dc50f218f77b43e3d04e7a0f8;hp=1c696545e92c35f176d5251e89797643b2a6692a;hpb=8b596b57e1ff348a11b596b85278c17445e06afb;p=babeltrace.git

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 1c696545..bc03826c 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -67,7 +67,7 @@ void print_component_classes_found(struct bt_component_factory *factory)
 
 	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.");
+		fprintf(stderr, "No component classes found. Please make sure your plug-in search path is set correctly.\n");
 		return;
 	}
 
@@ -94,9 +94,9 @@ void print_component_classes_found(struct bt_component_factory *factory)
 
 		printf_verbose("[%s - %s (%s)]\n", plugin_name, component_name,
 			       component_type_str(type));
-		printf_verbose("\tpath: %s\n", path);
-		printf_verbose("\tauthor: %s\n", author);
-		printf_verbose("\tlicense: %s\n", license);
+		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",
@@ -205,8 +205,24 @@ 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("    begin timestamp: ");
+
+	if (bt_config_component->begin_ns == -1ULL) {
+		printf("not set\n");
+	} else {
+		printf("%" PRIu64 " ns\n", bt_config_component->begin_ns);
+	}
+
+	printf("    end timestamp: ");
+
+	if (bt_config_component->end_ns == -1ULL) {
+		printf("not set\n");
+	} else {
+		printf("%" PRIu64 " ns\n", bt_config_component->end_ns);
+	}
+
 	printf("    params:\n");
 	print_value(bt_config_component->params, 6, true);
 }
@@ -218,7 +234,7 @@ void print_bt_config_components(GPtrArray *array)
 
 	for (i = 0; i < array->len; i++) {
 		struct bt_config_component *cfg_component =
-			bt_config_get_component(array, i);
+				bt_config_get_component(array, i);
 		print_bt_config_component(cfg_component);
 		BT_PUT(cfg_component);
 	}
@@ -252,7 +268,7 @@ int main(int argc, char **argv)
 	enum bt_component_status sink_status;
 	struct bt_value *first_plugin_path_value = NULL;
 	const char *first_plugin_path;
-	struct bt_config_component *cfg_component;
+	struct bt_config_component *source_cfg = NULL, *sink_cfg = NULL;
 
 	cfg = bt_config_from_args(argc, argv, &ret);
 	if (cfg) {
@@ -266,25 +282,13 @@ int main(int argc, char **argv)
 
 	/* TODO handle more than 1 source and 1 sink. */
 	if (cfg->sources->len != 1 || cfg->sinks->len != 1) {
-		fprintf(stderr, "Unexpected configuration, aborting.../n");
+		fprintf(stderr, "Unexpected configuration, aborting...\n");
 		ret = -1;
 		goto end;
 	}
-	cfg_component = bt_config_get_component(cfg->sources, 0);
-	source_params = bt_get(cfg_component->params);
-	BT_PUT(cfg_component);
-	cfg_component = bt_config_get_component(cfg->sinks, 0);
-	sink_params = bt_get(cfg_component->params);
-	BT_PUT(cfg_component);
 
 	printf_verbose("Verbose mode active.\n");
 	printf_debug("Debug mode active.\n");
-
-	if (bt_value_array_is_empty(cfg->plugin_paths)) {
-		fprintf(stderr, "No plugin path specified, aborting...\n");
-		ret = -1;
-		goto end;
-	}
 	component_factory = bt_component_factory_create();
 	if (!component_factory) {
 		fprintf(stderr, "Failed to create component factory.\n");
@@ -292,44 +296,64 @@ int main(int argc, char **argv)
 		goto end;
 	}
 
-	first_plugin_path_value = bt_value_array_get(cfg->plugin_paths, 0);
-	bt_value_string_get(first_plugin_path_value, &first_plugin_path);
+	if (cfg->plugin_paths && !bt_value_array_is_empty(cfg->plugin_paths)) {
+		first_plugin_path_value = bt_value_array_get(
+				cfg->plugin_paths, 0);
+		bt_value_string_get(first_plugin_path_value,
+				&first_plugin_path);
+		ret = bt_component_factory_load_recursive(component_factory,
+				first_plugin_path);
+		if (ret) {
+			fprintf(stderr, "Failed to dynamically load plugins.\n");
+			goto end;
+		}
+	}
 
-	ret = bt_component_factory_load_recursive(component_factory,
-			first_plugin_path);
+	ret = bt_component_factory_load_static(component_factory);
 	if (ret) {
-		fprintf(stderr, "Failed to load plugins.\n");
+		fprintf(stderr, "Failed to load static plugins.\n");
 		goto end;
 	}
 
 	print_component_classes_found(component_factory);
+
+	source_cfg = bt_config_get_component(cfg->sources, 0);
+	source_params = bt_get(source_cfg->params);
 	source_class = bt_component_factory_get_component_class(
-			component_factory, "ctf", BT_COMPONENT_TYPE_SOURCE,
-			"fs");
+			component_factory, source_cfg->plugin_name->str,
+			BT_COMPONENT_TYPE_SOURCE,
+			source_cfg->component_name->str);
 	if (!source_class) {
-		fprintf(stderr, "Could not find ctf-fs source component class. Aborting...\n");
+		fprintf(stderr, "Could not find %s.%s source component class. Aborting...\n",
+				source_cfg->plugin_name->str,
+				source_cfg->component_name->str);
 		ret = -1;
 		goto end;
 	}
 
+	sink_cfg = bt_config_get_component(cfg->sinks, 0);
+	sink_params = bt_get(sink_cfg->params);
 	sink_class = bt_component_factory_get_component_class(component_factory,
-			NULL, BT_COMPONENT_TYPE_SINK, "text");
+			sink_cfg->plugin_name->str, BT_COMPONENT_TYPE_SINK,
+			sink_cfg->component_name->str);
 	if (!sink_class) {
-		fprintf(stderr, "Could not find text output component class. Aborting...\n");
+		fprintf(stderr, "Could not find %s.%s output component class. Aborting...\n",
+				sink_cfg->plugin_name->str,
+				sink_cfg->component_name->str);
 		ret = -1;
 		goto end;
 	}
 
-	source = bt_component_create(source_class, "ctf-fs", source_params);
+	source = bt_component_create(source_class, "source", source_params);
 	if (!source) {
-		fprintf(stderr, "Failed to instantiate ctf-fs source component. Aborting...\n");
+		fprintf(stderr, "Failed to instantiate selected source component. Aborting...\n");
                 ret = -1;
                 goto end;
         }
 
-	sink = bt_component_create(sink_class, "text", sink_params);
+	sink = bt_component_create(sink_class, "sink", sink_params);
 	if (!sink) {
-		fprintf(stderr, "Failed to instanciate text output component. Aborting...\n");
+		fprintf(stderr, "Failed to instantiate selected output component. Aborting...\n");
 		ret = -1;
 		goto end;
 	}
@@ -375,5 +399,7 @@ end:
 	BT_PUT(it);
 	BT_PUT(cfg);
 	BT_PUT(first_plugin_path_value);
+	BT_PUT(sink_cfg);
+	BT_PUT(source_cfg);
 	return ret ? 1 : 0;
 }