X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=af789b1856f849bb186eafbf7eaba04d3710b4a1;hb=8d24f1c074ca616e1e2a784cdd0f7fa2faa220a9;hp=d6a9faa0d92b17600aee8c057efe76d3c073243b;hpb=b86d17b103112c5b0061e70450fae38acd67a546;p=babeltrace.git

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index d6a9faa0..af789b18 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -39,6 +39,9 @@
 #include <string.h>
 #include <stdio.h>
 #include "babeltrace-cfg.h"
+#include "default-cfg.h"
+
+static struct bt_component_factory *component_factory;
 
 static
 const char *component_type_str(enum bt_component_type type)
@@ -94,9 +97,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",
@@ -113,7 +116,7 @@ void print_indent(size_t indent)
 	size_t i;
 
 	for (i = 0; i < indent; i++) {
-		printf(" ");
+		printf_verbose(" ");
 	}
 }
 
@@ -126,7 +129,7 @@ bool print_map_value(const char *key, struct bt_value *object, void *data)
 	size_t indent = (size_t) data;
 
 	print_indent(indent);
-	printf("\"%s\": ", key);
+	printf_verbose("\"%s\": ", key);
 	print_value(object, indent, false);
 
 	return true;
@@ -152,27 +155,27 @@ void print_value(struct bt_value *value, size_t indent, bool do_indent)
 
 	switch (bt_value_get_type(value)) {
 	case BT_VALUE_TYPE_NULL:
-		printf("null\n");
+		printf_verbose("null\n");
 		break;
 	case BT_VALUE_TYPE_BOOL:
 		bt_value_bool_get(value, &bool_val);
-		printf("%s\n", bool_val ? "true" : "false");
+		printf_verbose("%s\n", bool_val ? "true" : "false");
 		break;
 	case BT_VALUE_TYPE_INTEGER:
 		bt_value_integer_get(value, &int_val);
-		printf("%" PRId64 "\n", int_val);
+		printf_verbose("%" PRId64 "\n", int_val);
 		break;
 	case BT_VALUE_TYPE_FLOAT:
 		bt_value_float_get(value, &dbl_val);
-		printf("%lf\n", dbl_val);
+		printf_verbose("%lf\n", dbl_val);
 		break;
 	case BT_VALUE_TYPE_STRING:
 		bt_value_string_get(value, &str_val);
-		printf("\"%s\"\n", str_val);
+		printf_verbose("\"%s\"\n", str_val);
 		break;
 	case BT_VALUE_TYPE_ARRAY:
 		size = bt_value_array_size(value);
-		printf("[\n");
+		printf_verbose("[\n");
 
 		for (i = 0; i < size; i++) {
 			struct bt_value *element =
@@ -183,19 +186,19 @@ void print_value(struct bt_value *value, size_t indent, bool do_indent)
 		}
 
 		print_indent(indent);
-		printf("]\n");
+		printf_verbose("]\n");
 		break;
 	case BT_VALUE_TYPE_MAP:
 		if (bt_value_map_is_empty(value)) {
-			printf("{}\n");
+			printf_verbose("{}\n");
 			return;
 		}
 
-		printf("{\n");
+		printf_verbose("{\n");
 		bt_value_map_foreach(value, print_map_value,
 			(void *) (indent + 2));
 		print_indent(indent);
-		printf("}\n");
+		printf_verbose("}\n");
 		break;
 	default:
 		assert(false);
@@ -205,9 +208,9 @@ 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_verbose("  %s.%s\n", bt_config_component->plugin_name->str,
 		bt_config_component->component_name->str);
-	printf("    params:\n");
+	printf_verbose("    params:\n");
 	print_value(bt_config_component->params, 6, true);
 }
 
@@ -218,7 +221,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);
 	}
@@ -227,55 +230,211 @@ void print_bt_config_components(GPtrArray *array)
 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");
+	printf_verbose("debug:           %d\n", cfg->debug);
+	printf_verbose("verbose:         %d\n", cfg->verbose);
+	printf_verbose("do list:         %d\n", cfg->do_list);
+	printf_verbose("force correlate: %d\n", cfg->force_correlate);
+	printf_verbose("plugin paths:\n");
 	print_value(cfg->plugin_paths, 2, true);
-	printf("sources:\n");
+	printf_verbose("sources:\n");
 	print_bt_config_components(cfg->sources);
-	printf("sinks:\n");
+	printf_verbose("sinks:\n");
 	print_bt_config_components(cfg->sinks);
 }
 
-int main(int argc, char **argv)
+static
+struct bt_component *create_trimmer(struct bt_config_component *source_cfg)
+{
+	struct bt_component *trimmer = NULL;
+	struct bt_component_class *trimmer_class = NULL;
+	struct bt_value *trimmer_params = NULL;
+	struct bt_value *value;
+
+	assert(component_factory);
+	trimmer_params = bt_value_map_create();
+	if (!trimmer_params) {
+		goto end;
+	}
+
+	value = bt_value_map_get(source_cfg->params, "begin");
+	if (value) {
+	        enum bt_value_status ret;
+
+		ret = bt_value_map_insert(trimmer_params, "begin",
+				value);
+	        BT_PUT(value);
+		if (ret) {
+			goto end;
+		}
+	}
+	value = bt_value_map_get(source_cfg->params, "end");
+	if (value) {
+		enum bt_value_status ret;
+
+		ret = bt_value_map_insert(trimmer_params, "end",
+				value);
+		BT_PUT(value);
+		if (ret) {
+			goto end;
+		}
+	}
+	value = bt_value_map_get(source_cfg->params, "clock-gmt");
+	if (value) {
+		enum bt_value_status ret;
+
+		ret = bt_value_map_insert(trimmer_params, "clock-gmt",
+				value);
+		BT_PUT(value);
+		if (ret) {
+			goto end;
+		}
+	}
+
+	trimmer_class = bt_component_factory_get_component_class(
+			component_factory, "utils", BT_COMPONENT_TYPE_FILTER,
+			"trimmer");
+	if (!trimmer_class) {
+		fprintf(stderr, "Could not find trimmer component class. Aborting...\n");
+		goto end;
+	}
+	trimmer = bt_component_create(trimmer_class, "source_trimmer",
+			trimmer_params);
+	if (!trimmer) {
+		goto end;
+	}
+end:
+	bt_put(trimmer_params);
+	bt_put(trimmer_class);
+	return trimmer;
+}
+
+static
+int connect_source_sink(struct bt_component *source,
+		struct bt_config_component *source_cfg,
+		struct bt_component *sink)
+{
+	int ret = 0;
+	enum bt_component_status sink_status;
+	struct bt_component *trimmer = NULL;
+	struct bt_notification_iterator *source_it = NULL;
+	struct bt_notification_iterator *to_sink_it = NULL;
+
+	source_it = bt_component_source_create_iterator(source);
+	if (!source_it) {
+		fprintf(stderr, "Failed to instantiate source iterator. Aborting...\n");
+                ret = -1;
+                goto end;
+        }
+
+	if (bt_value_map_has_key(source_cfg->params, "begin")
+			|| bt_value_map_has_key(source_cfg->params, "end")) {
+		/* A trimmer must be inserted in the graph. */
+		enum bt_component_status trimmer_status;
+
+		trimmer = create_trimmer(source_cfg);
+		if (!trimmer) {
+			fprintf(stderr, "Failed to create trimmer component. Aborting...\n");
+			ret = -1;
+			goto end;
+		}
+
+		trimmer_status = bt_component_filter_add_iterator(trimmer,
+				source_it);
+		BT_PUT(source_it);
+		if (trimmer_status != BT_COMPONENT_STATUS_OK) {
+			fprintf(stderr, "Failed to connect source to trimmer. Aborting...\n");
+			ret = -1;
+			goto end;
+		}
+
+		to_sink_it = bt_component_filter_create_iterator(trimmer);
+		if (!to_sink_it) {
+			fprintf(stderr, "Failed to instantiate trimmer iterator. Aborting...\n");
+			ret = -1;
+			goto end;
+		}
+	} else {
+		BT_MOVE(to_sink_it, source_it);
+	}
+
+	sink_status = bt_component_sink_add_iterator(sink, to_sink_it);
+	if (sink_status != BT_COMPONENT_STATUS_OK) {
+		fprintf(stderr, "Failed to connect to sink component. Aborting...\n");
+		ret = -1;
+		goto end;
+	}
+end:
+	bt_put(trimmer);
+	bt_put(source_it);
+	bt_put(to_sink_it);
+	return ret;
+}
+
+static int load_plugins(struct bt_config *cfg)
+{
+	int nr_paths, i;
+
+	nr_paths = bt_value_array_size(cfg->plugin_paths);
+	if (nr_paths < 0) {
+		return -1;
+	}
+	for (i = 0; i < nr_paths; i++) {
+		struct bt_value *plugin_path_value = NULL;
+		const char *plugin_path;
+
+		plugin_path_value = bt_value_array_get(cfg->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)) {
+			printf_debug("Unable to dynamically load plugins from path %s.\n",
+				plugin_path);
+		}
+		BT_PUT(plugin_path_value);
+	}
+	return 0;
+}
+
+int main(int argc, const char **argv)
 {
 	int ret;
-	struct bt_component_factory *component_factory = NULL;
 	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;
-	struct bt_notification_iterator *it = NULL;
 	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) {
+	cfg = bt_config_create();
+	if (!cfg) {
+		fprintf(stderr, "Failed to create Babeltrace configuration\n");
+		ret = 1;
+		goto end;
+	}
+
+	ret = set_default_config(cfg);
+	if (ret) {
+		goto end;
+	}
+
+	ret = bt_config_init_from_args(cfg, argc, argv);	
+	if (ret == 0) {
+		babeltrace_verbose = cfg->verbose;
+		babeltrace_debug = cfg->debug;
 		print_cfg(cfg);
 	} else {
 		goto end;
 	}
 
-	babeltrace_verbose = cfg->verbose;
-	babeltrace_debug = cfg->debug;
-
 	/* TODO handle more than 1 source and 1 sink. */
 	if (cfg->sources->len != 1 || cfg->sinks->len != 1) {
-		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");
@@ -286,17 +445,10 @@ int main(int argc, char **argv)
 		goto end;
 	}
 
-	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;
-		}
+	if (load_plugins(cfg)) {
+		fprintf(stderr, "Failed to load plugins.\n");
+		ret = -1;
+		goto end;
 	}
 
 	ret = bt_component_factory_load_static(component_factory);
@@ -306,47 +458,50 @@ int main(int argc, char **argv)
 	}
 
 	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;
 	}
 
-	it = bt_component_source_create_iterator(source);
-	if (!it) {
-		fprintf(stderr, "Failed to instantiate source iterator. Aborting...\n");
-                ret = -1;
-                goto end;
-        }
-
-	sink_status = bt_component_sink_add_iterator(sink, it);
-	if (sink_status != BT_COMPONENT_STATUS_OK) {
-		ret = -1;
+	ret = connect_source_sink(source, source_cfg, sink);
+	if (ret) {
 		goto end;
 	}
 
@@ -375,8 +530,8 @@ end:
 	BT_PUT(sink);
 	BT_PUT(source_params);
 	BT_PUT(sink_params);
-	BT_PUT(it);
 	BT_PUT(cfg);
-	BT_PUT(first_plugin_path_value);
+	BT_PUT(sink_cfg);
+	BT_PUT(source_cfg);
 	return ret ? 1 : 0;
 }