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

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index ddb3b0ee..85851ceb 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -44,6 +44,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include "babeltrace-cfg.h"
+#include "babeltrace-cfg-connect.h"
 #include "default-cfg.h"
 
 GPtrArray *loaded_plugins;
@@ -111,6 +112,9 @@ void print_indent(size_t indent)
 static
 void print_value(struct bt_value *, size_t);
 
+static
+void print_value_rec(struct bt_value *, size_t);
+
 static
 bool print_map_value(const char *key, struct bt_value *object, void *data)
 {
@@ -136,12 +140,12 @@ bool print_map_value(const char *key, struct bt_value *object, void *data)
 		printf("\n");
 	}
 
-	print_value(object, *indent + 2);
+	print_value_rec(object, *indent + 2);
 	return true;
 }
 
 static
-void print_value(struct bt_value *value, size_t indent)
+void print_value_rec(struct bt_value *value, size_t indent)
 {
 	bool bool_val;
 	int64_t int_val;
@@ -156,23 +160,32 @@ void print_value(struct bt_value *value, size_t indent)
 
 	switch (bt_value_get_type(value)) {
 	case BT_VALUE_TYPE_NULL:
-		printf("null\n");
+		printf("%snull%s\n", bt_common_color_bold(),
+			bt_common_color_reset());
 		break;
 	case BT_VALUE_TYPE_BOOL:
 		bt_value_bool_get(value, &bool_val);
-		printf("%s\n", bool_val ? "yes" : "no");
+		printf("%s%s%s%s\n", bt_common_color_bold(),
+			bt_common_color_fg_cyan(), bool_val ? "yes" : "no",
+			bt_common_color_reset());
 		break;
 	case BT_VALUE_TYPE_INTEGER:
 		bt_value_integer_get(value, &int_val);
-		printf("%" PRId64 "\n", int_val);
+		printf("%s%s%" PRId64 "%s\n", bt_common_color_bold(),
+			bt_common_color_fg_red(), int_val,
+			bt_common_color_reset());
 		break;
 	case BT_VALUE_TYPE_FLOAT:
 		bt_value_float_get(value, &dbl_val);
-		printf("%lf\n", dbl_val);
+		printf("%s%s%lf%s\n", bt_common_color_bold(),
+			bt_common_color_fg_red(), dbl_val,
+			bt_common_color_reset());
 		break;
 	case BT_VALUE_TYPE_STRING:
 		bt_value_string_get(value, &str_val);
-		printf("%s\n", str_val);
+		printf("%s%s%s%s\n", bt_common_color_bold(),
+			bt_common_color_fg_green(), str_val,
+			bt_common_color_reset());
 		break;
 	case BT_VALUE_TYPE_ARRAY:
 		size = bt_value_array_size(value);
@@ -209,7 +222,7 @@ void print_value(struct bt_value *value, size_t indent)
 				printf("\n");
 			}
 
-			print_value(element, indent + 2);
+			print_value_rec(element, indent + 2);
 			BT_PUT(element);
 		}
 		break;
@@ -227,11 +240,27 @@ void print_value(struct bt_value *value, size_t indent)
 	}
 }
 
+static
+void print_value(struct bt_value *value, size_t indent)
+{
+	if (!bt_value_is_array(value) && !bt_value_is_map(value)) {
+		print_indent(indent);
+	}
+
+	print_value_rec(value, indent);
+}
+
 static
 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);
+
+	if (bt_config_component->instance_name->len > 0) {
+		printf("      Name: %s\n",
+			bt_config_component->instance_name->str);
+	}
+
 	printf("      Parameters:\n");
 	print_value(bt_config_component->params, 8);
 }
@@ -259,13 +288,36 @@ void print_plugin_paths(struct bt_value *plugin_paths)
 static
 void print_cfg_convert(struct bt_config *cfg)
 {
+	size_t i;
+
 	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);
+
+	if (cfg->cmd_data.convert.filters->len > 0) {
+		printf("  Filter component instances:\n");
+		print_bt_config_components(cfg->cmd_data.convert.filters);
+	}
+
 	printf("  Sink component instances:\n");
 	print_bt_config_components(cfg->cmd_data.convert.sinks);
+	printf("  Connections:\n");
+
+	for (i = 0; i < cfg->cmd_data.convert.connections->len; i++) {
+		struct bt_config_connection *cfg_connection =
+			g_ptr_array_index(cfg->cmd_data.convert.connections,
+				i);
+
+		printf("    %s%s%s -> %s%s%s\n",
+			cfg_connection->src_instance_name->str,
+			cfg_connection->src_port_name->len > 0 ? "." : "",
+			cfg_connection->src_port_name->str,
+			cfg_connection->dst_instance_name->str,
+			cfg_connection->dst_port_name->len > 0 ? "." : "",
+			cfg_connection->dst_port_name->str);
+	}
 }
 
 static
@@ -274,6 +326,21 @@ void print_cfg_list_plugins(struct bt_config *cfg)
 	print_plugin_paths(cfg->cmd_data.list_plugins.plugin_paths);
 }
 
+static
+void print_cfg_help(struct bt_config *cfg)
+{
+	print_plugin_paths(cfg->cmd_data.help.plugin_paths);
+}
+
+static
+void print_cfg_query_info(struct bt_config *cfg)
+{
+	print_plugin_paths(cfg->cmd_data.query_info.plugin_paths);
+	printf("  Action: `%s`\n", cfg->cmd_data.query_info.action->str);
+	printf("  Component class:\n");
+	print_bt_config_component(cfg->cmd_data.query_info.cfg_component);
+}
+
 static
 void print_cfg(struct bt_config *cfg)
 {
@@ -292,6 +359,12 @@ void print_cfg(struct bt_config *cfg)
 	case BT_CONFIG_COMMAND_LIST_PLUGINS:
 		print_cfg_list_plugins(cfg);
 		break;
+	case BT_CONFIG_COMMAND_HELP:
+		print_cfg_help(cfg);
+		break;
+	case BT_CONFIG_COMMAND_QUERY_INFO:
+		print_cfg_query_info(cfg);
+		break;
 	default:
 		assert(false);
 	}
@@ -603,6 +676,63 @@ static void print_plugin_comp_cls_opt(FILE *fh, const char *plugin_name,
 		bt_common_color_reset());
 }
 
+static int cmd_query_info(struct bt_config *cfg)
+{
+	int ret;
+	struct bt_component_class *comp_cls = NULL;
+	struct bt_value *results = NULL;
+
+	ret = load_all_plugins(cfg->cmd_data.list_plugins.plugin_paths);
+	if (ret) {
+		goto end;
+	}
+
+	comp_cls = find_component_class(cfg->cmd_data.query_info.cfg_component->plugin_name->str,
+		cfg->cmd_data.query_info.cfg_component->component_name->str,
+		cfg->cmd_data.query_info.cfg_component->type);
+	if (!comp_cls) {
+		fprintf(stderr, "%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.query_info.cfg_component->plugin_name->str,
+			cfg->cmd_data.query_info.cfg_component->component_name->str,
+			cfg->cmd_data.query_info.cfg_component->type);
+		fprintf(stderr, "\n");
+		ret = -1;
+		goto end;
+	}
+
+	results = bt_component_class_query_info(comp_cls,
+		cfg->cmd_data.query_info.action->str,
+		cfg->cmd_data.query_info.cfg_component->params);
+	if (!results) {
+		fprintf(stderr, "%s%sFailed to query info to %s",
+			bt_common_color_bold(),
+			bt_common_color_fg_red(),
+			bt_common_color_reset());
+		print_plugin_comp_cls_opt(stderr,
+			cfg->cmd_data.query_info.cfg_component->plugin_name->str,
+			cfg->cmd_data.query_info.cfg_component->component_name->str,
+			cfg->cmd_data.query_info.cfg_component->type);
+		fprintf(stderr, "%s%s with action `%s`%s\n",
+			bt_common_color_bold(),
+			bt_common_color_fg_red(),
+			cfg->cmd_data.query_info.action->str,
+			bt_common_color_reset());
+		ret = -1;
+		goto end;
+	}
+
+	print_value(results, 0);
+
+end:
+	bt_put(comp_cls);
+	bt_put(results);
+	return ret;
+}
+
 static int cmd_help(struct bt_config *cfg)
 {
 	int ret;
@@ -614,12 +744,12 @@ static int cmd_help(struct bt_config *cfg)
 		goto end;
 	}
 
-	plugin = find_plugin(cfg->cmd_data.help.plugin_name->str);
+	plugin = find_plugin(cfg->cmd_data.help.cfg_component->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,
+			cfg->cmd_data.help.cfg_component->plugin_name->str,
 			bt_common_color_reset());
 		ret = -1;
 		goto end;
@@ -632,13 +762,13 @@ static int cmd_help(struct bt_config *cfg)
 			bt_plugin_get_component_class_count(plugin));
 
 
-	if (cfg->cmd_data.help.comp_cls_type !=
+	if (cfg->cmd_data.help.cfg_component->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);
+				cfg->cmd_data.help.cfg_component->plugin_name->str,
+				cfg->cmd_data.help.cfg_component->component_name->str,
+				cfg->cmd_data.help.cfg_component->type);
 
 		if (!needed_comp_cls) {
 			fprintf(stderr, "\n%s%sCannot find component class %s",
@@ -646,9 +776,9 @@ static int cmd_help(struct bt_config *cfg)
 				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);
+				cfg->cmd_data.help.cfg_component->plugin_name->str,
+				cfg->cmd_data.help.cfg_component->component_name->str,
+				cfg->cmd_data.help.cfg_component->type);
 			fprintf(stderr, "\n");
 			ret = -1;
 			goto end;
@@ -671,12 +801,12 @@ static int cmd_help(struct bt_config *cfg)
 
 		assert(comp_cls);
 
-		if (cfg->cmd_data.help.comp_cls_type !=
+		if (cfg->cmd_data.help.cfg_component->type !=
 				BT_COMPONENT_CLASS_TYPE_UNKNOWN) {
-			if (strcmp(cfg->cmd_data.help.component_name->str,
+			if (strcmp(cfg->cmd_data.help.cfg_component->component_name->str,
 					comp_class_name) != 0 &&
 					type ==
-					cfg->cmd_data.help.comp_cls_type) {
+					cfg->cmd_data.help.cfg_component->type) {
 				bt_put(comp_cls);
 				continue;
 			}
@@ -684,7 +814,7 @@ static int cmd_help(struct bt_config *cfg)
 
 		printf("\n");
 		print_plugin_comp_cls_opt(stdout,
-			cfg->cmd_data.help.plugin_name->str,
+			cfg->cmd_data.help.cfg_component->plugin_name->str,
 			comp_class_name,
 			type);
 		printf("\n");
@@ -804,12 +934,14 @@ static int cmd_convert(struct bt_config *cfg)
 	/* TODO handle more than 1 source and 1 sink. */
 	if (cfg->cmd_data.convert.sources->len != 1 ||
 			cfg->cmd_data.convert.sinks->len != 1) {
+		fprintf(stderr, "Only one source and one sink component class are supported. Aborting...\n");
 		ret = -1;
 		goto end;
 	}
 
 	ret = load_all_plugins(cfg->cmd_data.convert.plugin_paths);
 	if (ret) {
+		fprintf(stderr, "Could not load plugins from configured plugin paths. Aborting...\n");
 		goto end;
 	}
 
@@ -945,6 +1077,9 @@ int main(int argc, const char **argv)
 	case BT_CONFIG_COMMAND_HELP:
 		ret = cmd_help(cfg);
 		break;
+	case BT_CONFIG_COMMAND_QUERY_INFO:
+		ret = cmd_query_info(cfg);
+		break;
 	default:
 		assert(false);
 	}