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)
{
const char *str_val;
int size;
int i;
+ GPtrArray *map_keys = NULL;
if (!value) {
- return;
+ goto end;
}
switch (bt_value_get_type(value)) {
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);
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;
+
+ goto end;
error:
BT_LOGE("Error printing value of type %s.",
bt_common_value_type_string(bt_value_get_type(value)));
+
+end:
+ if (map_keys) {
+ g_ptr_array_free(map_keys, TRUE);
+ }
}
static
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;
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;
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;
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;
"range-ns:begin=%" PRId64 ", "
"range-ns:end=%" PRId64,
begin_ns, end_ns);
- ret = -1;
goto error;
}
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_CLI_LOGE_APPEND_CAUSE("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;
BT_ASSERT(query_result);
if (!bt_value_is_array(query_result)) {
- BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-info` query: expecting result to be an array: "
+ 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)));
trace_count = bt_value_array_get_length(query_result);
if (trace_count < 0) {
- BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-info` query: result is empty: "
+ 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 end;
BT_ASSERT(trace_info);
if (!bt_value_is_map(trace_info)) {
ret = -1;
- BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-info` query: expecting element to be a map: "
+ 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)));
}
stream_infos = bt_value_map_borrow_entry_value_const(
- trace_info, "streams");
+ trace_info, "stream-infos");
if (!stream_infos) {
ret = -1;
- BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-info` query: missing `streams` key in trace info map: "
+ 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-info` query: expecting `streams` entry of trace info map to be an array: "
+ 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)));
stream_count = bt_value_array_get_length(stream_infos);
if (stream_count < 0) {
ret = -1;
- BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-info` query: list of streams is empty: "
+ 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;
BT_ASSERT(stream_info);
if (!bt_value_is_map(stream_info)) {
ret = -1;
- BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-info` query: "
+ 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),
port_name = bt_value_map_borrow_entry_value_const(stream_info, "port-name");
if (!port_name) {
ret = -1;
- BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-info` query: "
+ 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));
if (!bt_value_is_string(port_name)) {
ret = -1;
- BT_CLI_LOGE_APPEND_CAUSE("`babeltrace.trace-info` query: "
+ 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),
projects / babeltrace.git / blobdiff