X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcli%2Fbabeltrace2.c;h=c63a16c77258990a41de6b7b023c36e56f51f17a;hb=7c7301d5827bd10ec7c34da7ffc5fe74e5047d38;hp=82406a0beeb028e77995b5a0db4d81f43fdb27c6;hpb=30947af01a064c13fd12c8faf8f13e3d9fd8087f;p=babeltrace.git

diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c
index 82406a0b..c63a16c7 100644
--- a/src/cli/babeltrace2.c
+++ b/src/cli/babeltrace2.c
@@ -277,43 +277,55 @@ void print_value(FILE *, const bt_value *, size_t);
 static
 void print_value_rec(FILE *, const bt_value *, size_t);
 
-struct print_map_value_data {
-	size_t indent;
-	FILE *fp;
-};
-
 static
-bt_bool print_map_value(const char *key, const bt_value *object,
-		void *data)
+void print_map_value(const char *key, const bt_value *object, FILE *fp,
+		size_t indent)
 {
-	struct print_map_value_data *print_map_value_data = data;
-
-	print_indent(print_map_value_data->fp, print_map_value_data->indent);
-	fprintf(print_map_value_data->fp, "%s: ", key);
+	print_indent(fp, indent);
+	fprintf(fp, "%s: ", key);
 	BT_ASSERT(object);
 
 	if (bt_value_is_array(object) &&
 			bt_value_array_is_empty(object)) {
-		fprintf(print_map_value_data->fp, "[ ]\n");
-		return true;
+		fprintf(fp, "[ ]\n");
+		goto end;
 	}
 
 	if (bt_value_is_map(object) &&
 			bt_value_map_is_empty(object)) {
-		fprintf(print_map_value_data->fp, "{ }\n");
-		return true;
+		fprintf(fp, "{ }\n");
+		goto end;
 	}
 
 	if (bt_value_is_array(object) ||
 			bt_value_is_map(object)) {
-		fprintf(print_map_value_data->fp, "\n");
+		fprintf(fp, "\n");
 	}
 
-	print_value_rec(print_map_value_data->fp, object,
-		print_map_value_data->indent + 2);
+	print_value_rec(fp, object, indent + 2);
+
+end:
+	return;
+}
+
+static
+bt_bool collect_map_keys(const char *key, const bt_value *object, void *data)
+{
+	GPtrArray *map_keys = data;
+
+	g_ptr_array_add(map_keys, (gpointer *) key);
+
 	return BT_TRUE;
 }
 
+static
+gint g_ptr_array_sort_strings(gconstpointer a, gconstpointer b) {
+	const char *s1 = *((const char **) a);
+	const char *s2 = *((const char **) b);
+
+	return g_strcmp0(s1, s2);
+}
+
 static
 void print_value_rec(FILE *fp, const bt_value *value, size_t indent)
 {
@@ -322,11 +334,10 @@ void print_value_rec(FILE *fp, const bt_value *value, size_t indent)
 	uint64_t uint_val;
 	double dbl_val;
 	const char *str_val;
-	int size;
-	int i;
+	GPtrArray *map_keys = NULL;
 
 	if (!value) {
-		return;
+		goto end;
 	}
 
 	switch (bt_value_get_type(value)) {
@@ -365,11 +376,9 @@ void print_value_rec(FILE *fp, const bt_value *value, size_t indent)
 			bt_common_color_reset());
 		break;
 	case BT_VALUE_TYPE_ARRAY:
+	{
+		uint64_t i, size;
 		size = bt_value_array_get_length(value);
-		if (size < 0) {
-			goto error;
-		}
-
 		if (size == 0) {
 			print_indent(fp, indent);
 			fprintf(fp, "[ ]\n");
@@ -381,9 +390,6 @@ void print_value_rec(FILE *fp, const bt_value *value, size_t indent)
 				bt_value_array_borrow_element_by_index_const(
 					value, i);
 
-			if (!element) {
-				goto error;
-			}
 			print_indent(fp, indent);
 			fprintf(fp, "- ");
 
@@ -407,12 +413,11 @@ void print_value_rec(FILE *fp, const bt_value *value, size_t indent)
 			print_value_rec(fp, element, indent + 2);
 		}
 		break;
+	}
 	case BT_VALUE_TYPE_MAP:
 	{
-		struct print_map_value_data data = {
-			.indent = indent,
-			.fp = fp,
-		};
+		guint i;
+		bt_value_map_foreach_entry_const_status foreach_status;
 
 		if (bt_value_map_is_empty(value)) {
 			print_indent(fp, indent);
@@ -420,17 +425,48 @@ void print_value_rec(FILE *fp, const bt_value *value, size_t indent)
 			break;
 		}
 
-		bt_value_map_foreach_entry_const(value, print_map_value, &data);
+		map_keys = g_ptr_array_new();
+		if (!map_keys) {
+			BT_CLI_LOGE_APPEND_CAUSE("Failed to allocated on GPtrArray.");
+			goto end;
+		}
+
+		/*
+		 * We want to print the map entries in a stable order.  Collect
+		 * all the map's keys in a GPtrArray, sort it, then print the
+		 * entries in that order.
+		 */
+		foreach_status = bt_value_map_foreach_entry_const(value,
+			collect_map_keys, map_keys);
+		if (foreach_status != BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_OK) {
+			BT_CLI_LOGE_APPEND_CAUSE("Failed to iterator on map value.");
+			goto end;
+		}
+
+		g_ptr_array_sort(map_keys, g_ptr_array_sort_strings);
+
+		for (i = 0; i < map_keys->len; i++) {
+			const char *map_key = g_ptr_array_index(map_keys, i);
+			const bt_value *map_value;
+
+			map_value = bt_value_map_borrow_entry_value_const(value, map_key);
+			BT_ASSERT(map_value);
+
+			print_map_value(map_key, map_value, fp, indent);
+		}
+
 		break;
 	}
 	default:
 		abort();
 	}
-	return;
 
-error:
-	BT_LOGE("Error printing value of type %s.",
-		bt_common_value_type_string(bt_value_get_type(value)));
+	goto end;
+
+end:
+	if (map_keys) {
+		g_ptr_array_free(map_keys, TRUE);
+	}
 }
 
 static
@@ -775,6 +811,7 @@ typedef void *(* plugin_borrow_comp_cls_by_index_func_t)(const bt_plugin *,
 typedef const bt_component_class *(* spec_comp_cls_borrow_comp_cls_func_t)(
 	void *);
 
+static
 void cmd_list_plugins_print_component_classes(const bt_plugin *plugin,
 		const char *cc_type_name, uint64_t count,
 		plugin_borrow_comp_cls_by_index_func_t borrow_comp_cls_by_index_func,
@@ -896,7 +933,7 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg)
 	static const char * const comp_cls_name = "lttng-live";
 	static const bt_component_class_type comp_cls_type =
 		BT_COMPONENT_CLASS_TYPE_SOURCE;
-	int64_t array_size, i;
+	uint64_t array_size, i;
 	const char *fail_reason = NULL;
 	FILE *out_stream = stdout;
 
@@ -960,10 +997,6 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg)
 		int64_t timer_us, streams, clients;
 
 		map = bt_value_array_borrow_element_by_index_const(results, i);
-		if (!map) {
-			BT_CLI_LOGE_APPEND_CAUSE("Unexpected empty array entry.");
-			goto error;
-		}
 		if (!bt_value_is_map(map)) {
 			BT_CLI_LOGE_APPEND_CAUSE("Unexpected entry type.");
 			goto error;
@@ -1928,8 +1961,7 @@ static
 int compute_stream_intersection(const bt_value *streams,
 		struct trace_range *range)
 {
-	unsigned int i;
-	unsigned int stream_count;
+	uint64_t i, stream_count;
 	int ret;
 
 	BT_ASSERT(bt_value_get_type(streams) == BT_VALUE_TYPE_ARRAY);
@@ -1951,7 +1983,7 @@ int compute_stream_intersection(const bt_value *streams,
 
 		stream_value = bt_value_array_borrow_element_by_index_const(streams, i);
 		if (bt_value_get_type(stream_value) != BT_VALUE_TYPE_MAP) {
-			BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-info` query result: "
+			BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-infos` query result: "
 				"expected streams array element to be a map, got %s.",
 				bt_common_value_type_string(bt_value_get_type(stream_value)));
 			goto error;
@@ -1960,13 +1992,13 @@ int compute_stream_intersection(const bt_value *streams,
 		range_ns_value = bt_value_map_borrow_entry_value_const(
 			stream_value, "range-ns");
 		if (!range_ns_value) {
-			BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-info` query result: "
+			BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-infos` query result: "
 				"missing expected `range-ns` key in stream map.");
 			goto error;
 		}
 
 		if (bt_value_get_type(range_ns_value) != BT_VALUE_TYPE_MAP) {
-			BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-info` query result: "
+			BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-infos` query result: "
 				"expected `range-ns` entry value of stream map to be a map, got %s.",
 				bt_common_value_type_string(bt_value_get_type(range_ns_value)));
 			goto error;
@@ -1974,13 +2006,13 @@ int compute_stream_intersection(const bt_value *streams,
 
 		begin_value = bt_value_map_borrow_entry_value_const(range_ns_value, "begin");
 		if (!begin_value) {
-			BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-info` query result: "
+			BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-infos` query result: "
 				"missing expected `begin` key in range-ns map.");
 			goto error;
 		}
 
 		if (bt_value_get_type(begin_value) != BT_VALUE_TYPE_SIGNED_INTEGER) {
-			BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-info` query result: "
+			BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-infos` query result: "
 				"expected `begin` entry value of range-ns map to be a signed integer, got %s.",
 				bt_common_value_type_string(bt_value_get_type(range_ns_value)));
 			goto error;
@@ -1988,13 +2020,13 @@ int compute_stream_intersection(const bt_value *streams,
 
 		end_value = bt_value_map_borrow_entry_value_const(range_ns_value, "end");
 		if (!end_value) {
-			BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-info` query result: "
+			BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-infos` query result: "
 				"missing expected `end` key in range-ns map.");
 			goto error;
 		}
 
 		if (bt_value_get_type(end_value) != BT_VALUE_TYPE_SIGNED_INTEGER) {
-			BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-info` query result: "
+			BT_CLI_LOGE_APPEND_CAUSE("Unexpected format of `babeltrace.trace-infos` query result: "
 				"expected `end` entry value of range-ns map to be a signed integer, got %s.",
 				bt_common_value_type_string(bt_value_get_type(range_ns_value)));
 			goto error;
@@ -2009,7 +2041,6 @@ int compute_stream_intersection(const bt_value *streams,
 				"range-ns:begin=%" PRId64 ", "
 				"range-ns:end=%" PRId64,
 				begin_ns, end_ns);
-			ret = -1;
 			goto error;
 		}
 
@@ -2038,7 +2069,7 @@ int set_stream_intersections(struct cmd_run_ctx *ctx,
 {
 	int ret = 0;
 	uint64_t trace_idx;
-	int64_t trace_count;
+	uint64_t trace_count;
 	const bt_value *query_result = NULL;
 	const bt_value *trace_info = NULL;
 	const bt_value *stream_infos = NULL;
@@ -2049,31 +2080,34 @@ int set_stream_intersections(struct cmd_run_ctx *ctx,
 	const bt_component_class *comp_cls =
 		bt_component_class_source_as_component_class_const(src_comp_cls);
 
-	ret = query(ctx->cfg, comp_cls, "babeltrace.trace-info",
+	ret = query(ctx->cfg, comp_cls, "babeltrace.trace-infos",
 		cfg_comp->params, &query_result,
 		&fail_reason);
 	if (ret) {
-		BT_LOGD("Component class does not support the `babeltrace.trace-info` query: %s: "
+		BT_CLI_LOGE_APPEND_CAUSE("Failed to execute `babeltrace.trace-infos` query: %s: "
 			"comp-class-name=\"%s\"", fail_reason,
 			bt_component_class_get_name(comp_cls));
 		ret = -1;
-		goto error;
+		goto end;
 	}
 
 	BT_ASSERT(query_result);
 
 	if (!bt_value_is_array(query_result)) {
-		BT_LOGD("Unexpected format of `babeltrace.trace-info` query result: "
-			"component-class-name=%s",
-			bt_component_class_get_name(comp_cls));
+		BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: expecting result to be an array: "
+			"component-class-name=%s, actual-type=%s",
+			bt_component_class_get_name(comp_cls),
+			bt_common_value_type_string(bt_value_get_type(query_result)));
 		ret = -1;
-		goto error;
+		goto end;
 	}
 
 	trace_count = bt_value_array_get_length(query_result);
-	if (trace_count < 0) {
+	if (trace_count == 0) {
+		BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: result is empty: "
+			"component-class-name=%s", bt_component_class_get_name(comp_cls));
 		ret = -1;
-		goto error;
+		goto end;
 	}
 
 	for (trace_idx = 0; trace_idx < trace_count; trace_idx++) {
@@ -2083,30 +2117,47 @@ int set_stream_intersections(struct cmd_run_ctx *ctx,
 
 		trace_info = bt_value_array_borrow_element_by_index_const(
 			query_result, trace_idx);
-		if (!trace_info || !bt_value_is_map(trace_info)) {
+		if (!bt_value_is_map(trace_info)) {
 			ret = -1;
-			BT_LOGD_STR("Cannot retrieve trace from query result.");
-			goto error;
+			BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: expecting element to be a map: "
+				"component-class-name=%s, actual-type=%s",
+				bt_component_class_get_name(comp_cls),
+				bt_common_value_type_string(bt_value_get_type(trace_info)));
+			goto end;
 		}
 
-		stream_infos = bt_value_map_borrow_entry_value_const(trace_info,
-								     "streams");
-		if (!stream_infos || !bt_value_is_array(stream_infos)) {
+		stream_infos = bt_value_map_borrow_entry_value_const(
+			trace_info, "stream-infos");
+		if (!stream_infos) {
 			ret = -1;
-			BT_LOGD_STR("Cannot retrieve stream information from trace in query result.");
-			goto error;
+			BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: missing `streams` key in trace info map: "
+				"component-class-name=%s",
+				bt_component_class_get_name(comp_cls));
+			goto end;
+		}
+
+		if (!bt_value_is_array(stream_infos)) {
+			ret = -1;
+			BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: expecting `streams` entry of trace info map to be an array: "
+				"component-class-name=%s, actual-type=%s",
+				bt_component_class_get_name(comp_cls),
+				bt_common_value_type_string(bt_value_get_type(stream_infos)));
+			goto end;
 		}
 
 		stream_count = bt_value_array_get_length(stream_infos);
-		if (stream_count < 0) {
+		if (stream_count == 0) {
 			ret = -1;
-			goto error;
+			BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: list of streams is empty: "
+				"component-class-name=%s",
+				bt_component_class_get_name(comp_cls));
+			goto end;
 		}
 
 		ret = compute_stream_intersection(stream_infos, &trace_intersection);
 		if (ret != 0) {
 			BT_CLI_LOGE_APPEND_CAUSE("Failed to compute trace streams intersection.");
-			goto error;
+			goto end;
 		}
 
 		for (stream_idx = 0; stream_idx < stream_count; stream_idx++) {
@@ -2117,14 +2168,14 @@ int set_stream_intersections(struct cmd_run_ctx *ctx,
 				ret = -1;
 				BT_CLI_LOGE_APPEND_CAUSE(
 					"Cannot allocate memory for port_id structure.");
-				goto error;
+				goto end;
 			}
 			port_id->instance_name = strdup(cfg_comp->instance_name->str);
 			if (!port_id->instance_name) {
 				ret = -1;
 				BT_CLI_LOGE_APPEND_CAUSE(
 					"Cannot allocate memory for port_id component instance name.");
-				goto error;
+				goto end;
 			}
 
 			stream_intersection = g_new0(struct trace_range, 1);
@@ -2132,26 +2183,41 @@ int set_stream_intersections(struct cmd_run_ctx *ctx,
 				ret = -1;
 				BT_CLI_LOGE_APPEND_CAUSE(
 					"Cannot allocate memory for trace_range structure.");
-				goto error;
+				goto end;
 			}
 
 			*stream_intersection = trace_intersection;
 
 			stream_info = bt_value_array_borrow_element_by_index_const(
 				stream_infos, stream_idx);
-			if (!stream_info || !bt_value_is_map(stream_info)) {
+			if (!bt_value_is_map(stream_info)) {
 				ret = -1;
-				BT_CLI_LOGE_APPEND_CAUSE(
-					"Cannot retrieve stream informations from trace in query result.");
-				goto error;
+				BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: "
+					"expecting element of stream list to be a map: "
+					"component-class-name=%s, actual-type=%s",
+					bt_component_class_get_name(comp_cls),
+					bt_common_value_type_string(bt_value_get_type(stream_info)));
+				goto end;
 			}
 
 			port_name = bt_value_map_borrow_entry_value_const(stream_info, "port-name");
-			if (!port_name || !bt_value_is_string(port_name)) {
+			if (!port_name) {
 				ret = -1;
-				BT_CLI_LOGE_APPEND_CAUSE(
-					"Cannot retrieve port name in query result.");
-				goto error;
+				BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: "
+					"missing `port-name` key in stream info map: "
+					"component-class-name=%s",
+					bt_component_class_get_name(comp_cls));
+				goto end;
+			}
+
+			if (!bt_value_is_string(port_name)) {
+				ret = -1;
+				BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-infos` query: "
+					"expecting `port-name` entry of stream info map to be a string: "
+					"component-class-name=%s, actual-type=%s",
+					bt_component_class_get_name(comp_cls),
+					bt_common_value_type_string(bt_value_get_type(port_name)));
+				goto end;
 			}
 
 			port_id->port_name = g_strdup(bt_value_string_get(port_name));
@@ -2159,7 +2225,7 @@ int set_stream_intersections(struct cmd_run_ctx *ctx,
 				ret = -1;
 				BT_CLI_LOGE_APPEND_CAUSE(
 					"Cannot allocate memory for port_id port_name.");
-				goto error;
+				goto end;
 			}
 
 			BT_LOGD("Inserting stream intersection ");
@@ -2171,11 +2237,7 @@ int set_stream_intersections(struct cmd_run_ctx *ctx,
 		}
 	}
 
-	goto end;
-
-error:
-	BT_CLI_LOGE_APPEND_CAUSE(
-		"Cannot determine stream intersection of trace.");
+	ret = 0;
 
 end:
 	bt_value_put_ref(query_result);
@@ -2268,6 +2330,8 @@ int cmd_run_ctx_create_components_from_config_components(
 				cfg_comp->type == BT_COMPONENT_CLASS_TYPE_SOURCE) {
 			ret = set_stream_intersections(ctx, cfg_comp, comp_cls);
 			if (ret) {
+				BT_CLI_LOGE_APPEND_CAUSE(
+					"Cannot determine stream intersection of trace.");
 				goto error;
 			}
 		}