X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=42a4f3088a8dc57d69bbbaf1095b792fbafeca54;hb=c1870f576149d488615883a7cfd12eddf78bd46a;hp=0246475ca94c845dd7aa18ef14e384dd7c15003b;hpb=6c2f3ee587ead98a0e4815ab44ea689656ec369a;p=babeltrace.git

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 0246475c..42a4f308 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -39,6 +39,7 @@
 #include <string.h>
 #include <stdio.h>
 #include "babeltrace-cfg.h"
+#include "default-cfg.h"
 
 static struct bt_component_factory *component_factory;
 
@@ -209,22 +210,6 @@ void print_bt_config_component(struct bt_config_component *bt_config_component)
 {
 	printf("  %s.%s\n", bt_config_component->plugin_name->str,
 		bt_config_component->component_name->str);
-	printf("    begin timestamp: ");
-
-	if (!bt_config_component->begin.set) {
-		printf("not set\n");
-	} else {
-		printf("%" PRIu64 " ns\n", bt_config_component->begin.value_ns);
-	}
-
-	printf("    end timestamp: ");
-
-	if (!bt_config_component->end.set) {
-		printf("not set\n");
-	} else {
-		printf("%" PRIu64 " ns\n", bt_config_component->end.value_ns);
-	}
-
 	printf("    params:\n");
 	print_value(bt_config_component->params, 6, true);
 }
@@ -263,6 +248,7 @@ 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();
@@ -270,34 +256,33 @@ struct bt_component *create_trimmer(struct bt_config_component *source_cfg)
 		goto end;
 	}
 
-	if (source_cfg->begin.set) {
+	value = bt_value_map_get(source_cfg->params, "begin");
+	if (value) {
 	        enum bt_value_status ret;
-		struct bt_value *value;
-
-		value = bt_value_integer_create_init(
-				source_cfg->begin.value_ns);
-		if (!value) {
-			goto end;
-		}
 
-		ret = bt_value_map_insert(trimmer_params, "begin_ns_epoch",
+		ret = bt_value_map_insert(trimmer_params, "begin",
 				value);
 	        BT_PUT(value);
 		if (ret) {
 			goto end;
 		}
 	}
-	if (source_cfg->end.set) {
+	value = bt_value_map_get(source_cfg->params, "end");
+	if (value) {
 		enum bt_value_status ret;
-		struct bt_value *value;
 
-		value = bt_value_integer_create_init(
-				source_cfg->end.value_ns);
-		if (!value) {
+		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, "end_ns_epoch",
+		ret = bt_value_map_insert(trimmer_params, "clock-gmt",
 				value);
 		BT_PUT(value);
 		if (ret) {
@@ -341,7 +326,8 @@ int connect_source_sink(struct bt_component *source,
                 goto end;
         }
 
-	if (source_cfg->begin.set || source_cfg->begin.set) {
+	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;
 
@@ -384,7 +370,35 @@ end:
 	return ret;
 }
 
-int main(int argc, char **argv)
+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_class *source_class = NULL;
@@ -393,12 +407,22 @@ int main(int argc, char **argv)
 	struct bt_value *source_params = NULL, *sink_params = NULL;
 	struct bt_config *cfg;
 	enum bt_component_status sink_status;
-	struct bt_value *first_plugin_path_value = NULL;
-	const char *first_plugin_path;
 	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) {
 		print_cfg(cfg);
 	} else {
 		goto end;
@@ -423,17 +447,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);
@@ -516,7 +533,6 @@ end:
 	BT_PUT(source_params);
 	BT_PUT(sink_params);
 	BT_PUT(cfg);
-	BT_PUT(first_plugin_path_value);
 	BT_PUT(sink_cfg);
 	BT_PUT(source_cfg);
 	return ret ? 1 : 0;