X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=cli%2Fbabeltrace.c;h=934f9f85eda9ebecaa44c0a6f296ede10da006d2;hb=1d0b2a8b3ba90ecef358805c2b31cc0180f76fc5;hp=29f811f4e9c804d7e4855c85f666df4252c86a4b;hpb=ee78f40548361d64c63956ee4d714a69651bd42c;p=babeltrace.git diff --git a/cli/babeltrace.c b/cli/babeltrace.c index 29f811f4..934f9f85 100644 --- a/cli/babeltrace.c +++ b/cli/babeltrace.c @@ -51,20 +51,22 @@ static const char* log_level_env_var_names[] = { "BABELTRACE_COMMON_LOG_LEVEL", "BABELTRACE_COMPAT_LOG_LEVEL", - "BABELTRACE_PLUGIN_CTF_BTR_LOG_LEVEL", - "BABELTRACE_SINK_CTF_FS_LOG_LEVEL", - "BABELTRACE_SRC_CTF_FS_LOG_LEVEL", - "BABELTRACE_SRC_CTF_LTTNG_LIVE_LOG_LEVEL", - "BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL", - "BABELTRACE_PLUGIN_CTF_MSG_ITER_LOG_LEVEL", - "BABELTRACE_PLUGIN_CTFCOPYTRACE_LIB_LOG_LEVEL", + "BABELTRACE_CTFSER_LOG_LEVEL", + "BABELTRACE_FD_CACHE_LOG_LEVEL", "BABELTRACE_FLT_LTTNG_UTILS_DEBUG_INFO_LOG_LEVEL", - "BABELTRACE_SRC_TEXT_DMESG_LOG_LEVEL", - "BABELTRACE_SINK_TEXT_PRETTY_LOG_LEVEL", + "BABELTRACE_FLT_UTILS_COUNTER_LOG_LEVEL", "BABELTRACE_FLT_UTILS_MUXER_LOG_LEVEL", "BABELTRACE_FLT_UTILS_TRIMMER_LOG_LEVEL", + "BABELTRACE_PLUGIN_CTF_BFCR_LOG_LEVEL", + "BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL", + "BABELTRACE_PLUGIN_CTF_MSG_ITER_LOG_LEVEL", + "BABELTRACE_PLUGIN_CTF_UTILS_LOG_LEVEL", "BABELTRACE_PYTHON_BT2_LOG_LEVEL", - "BABELTRACE_PYTHON_PLUGIN_PROVIDER_LOG_LEVEL", + "BABELTRACE_SINK_CTF_FS_LOG_LEVEL", + "BABELTRACE_SINK_TEXT_PRETTY_LOG_LEVEL", + "BABELTRACE_SRC_CTF_FS_LOG_LEVEL", + "BABELTRACE_SRC_CTF_LTTNG_LIVE_LOG_LEVEL", + "BABELTRACE_SRC_TEXT_DMESG_LOG_LEVEL", NULL, }; @@ -493,6 +495,7 @@ void print_value_rec(FILE *fp, const bt_value *value, size_t indent) { bt_bool bool_val; int64_t int_val; + uint64_t uint_val; double dbl_val; const char *str_val; int size; @@ -513,8 +516,14 @@ void print_value_rec(FILE *fp, const bt_value *value, size_t indent) bt_common_color_fg_cyan(), bool_val ? "yes" : "no", bt_common_color_reset()); break; - case BT_VALUE_TYPE_INTEGER: - int_val = bt_value_integer_get(value); + case BT_VALUE_TYPE_UNSIGNED_INTEGER: + uint_val = bt_value_unsigned_integer_get(value); + fprintf(fp, "%s%s%" PRIu64 "%s\n", bt_common_color_bold(), + bt_common_color_fg_red(), uint_val, + bt_common_color_reset()); + break; + case BT_VALUE_TYPE_SIGNED_INTEGER: + int_val = bt_value_signed_integer_get(value); fprintf(fp, "%s%s%" PRId64 "%s\n", bt_common_color_bold(), bt_common_color_fg_red(), int_val, bt_common_color_reset()); @@ -1110,13 +1119,15 @@ void cmd_list_plugins_print_component_classes(const bt_plugin *plugin, uint64_t i; if (count == 0) { - printf(" %s%s component classes%s: (none)\n", cc_type_name, + printf(" %s%s component classes%s: (none)\n", bt_common_color_bold(), + cc_type_name, bt_common_color_reset()); goto end; } else { - printf(" %s%s component classes%s:\n", cc_type_name, + printf(" %s%s component classes%s:\n", bt_common_color_bold(), + cc_type_name, bt_common_color_reset()); } @@ -1187,19 +1198,19 @@ int cmd_list_plugins(struct bt_config *cfg) cmd_list_plugins_print_component_classes(plugin, "Source", bt_plugin_get_source_component_class_count(plugin), (plugin_borrow_comp_cls_by_index_func_t) - bt_plugin_borrow_source_component_class_by_name_const, + bt_plugin_borrow_source_component_class_by_index_const, (spec_comp_cls_borrow_comp_cls_func_t) bt_component_class_source_as_component_class); cmd_list_plugins_print_component_classes(plugin, "Filter", bt_plugin_get_filter_component_class_count(plugin), (plugin_borrow_comp_cls_by_index_func_t) - bt_plugin_borrow_filter_component_class_by_name_const, + bt_plugin_borrow_filter_component_class_by_index_const, (spec_comp_cls_borrow_comp_cls_func_t) bt_component_class_filter_as_component_class); cmd_list_plugins_print_component_classes(plugin, "Sink", bt_plugin_get_sink_component_class_count(plugin), (plugin_borrow_comp_cls_by_index_func_t) - bt_plugin_borrow_sink_component_class_by_name_const, + bt_plugin_borrow_sink_component_class_by_index_const, (spec_comp_cls_borrow_comp_cls_func_t) bt_component_class_sink_as_component_class); } @@ -1311,21 +1322,21 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg) BT_LOGE_STR("Unexpected empty array \"timer-us\" entry."); goto error; } - timer_us = bt_value_integer_get(v); + timer_us = bt_value_signed_integer_get(v); fprintf(out_stream, " (timer = %" PRIu64 ", ", timer_us); v = bt_value_map_borrow_entry_value_const(map, "stream-count"); if (!v) { BT_LOGE_STR("Unexpected empty array \"stream-count\" entry."); goto error; } - streams = bt_value_integer_get(v); + streams = bt_value_signed_integer_get(v); fprintf(out_stream, "%" PRIu64 " stream(s), ", streams); v = bt_value_map_borrow_entry_value_const(map, "client-count"); if (!v) { BT_LOGE_STR("Unexpected empty array \"client-count\" entry."); goto error; } - clients = bt_value_integer_get(v); + clients = bt_value_signed_integer_get(v); fprintf(out_stream, "%" PRIu64 " client(s) connected)\n", clients); } @@ -1357,7 +1368,7 @@ end: } } - return 0; + return ret; } static @@ -1469,7 +1480,7 @@ end: } } - return 0; + return ret; } struct port_id { @@ -1707,7 +1718,6 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component( } downstream_port_count = port_count_fn(downstream_comp); - BT_ASSERT(downstream_port_count >= 0); for (i = 0; i < downstream_port_count; i++) { const bt_port_input *in_downstream_port = @@ -2147,10 +2157,7 @@ int set_stream_intersections(struct cmd_run_ctx *ctx, int ret = 0; uint64_t trace_idx; int64_t trace_count; - bt_value_status value_status; const char *path = NULL; - const bt_value *component_path_value = NULL; - bt_value *query_params = NULL; const bt_value *query_result = NULL; const bt_value *trace_info = NULL; const bt_value *intersection_range = NULL; @@ -2166,33 +2173,8 @@ 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); - component_path_value = bt_value_map_borrow_entry_value(cfg_comp->params, - "path"); - if (component_path_value && !bt_value_is_string(component_path_value)) { - BT_LOGD("Cannot get path parameter: component-name=%s", - cfg_comp->instance_name->str); - ret = -1; - goto error; - } - - path = bt_value_string_get(component_path_value); - query_params = bt_value_map_create(); - if (!query_params) { - BT_LOGE_STR("Cannot create query parameters."); - ret = -1; - goto error; - } - - value_status = bt_value_map_insert_string_entry(query_params, "path", - path); - if (value_status != BT_VALUE_STATUS_OK) { - BT_LOGE_STR("Cannot insert path parameter in query parameter map."); - ret = -1; - goto error; - } - ret = query(comp_cls, "trace-info", - query_params, &query_result, + cfg_comp->params, &query_result, &fail_reason); if (ret) { BT_LOGD("Component class does not support the `trace-info` query: %s: " @@ -2255,8 +2237,8 @@ int set_stream_intersections(struct cmd_run_ctx *ctx, goto error; } - begin = bt_value_integer_get(intersection_begin); - end = bt_value_integer_get(intersection_end); + begin = bt_value_signed_integer_get(intersection_begin); + end = bt_value_signed_integer_get(intersection_end); if (begin < 0 || end < 0 || end < begin) { BT_LOGW("Invalid trace stream intersection values: " @@ -2370,7 +2352,6 @@ error: path ? path : "(unknown)", bt_common_color_reset()); end: - bt_value_put_ref(query_params); bt_value_put_ref(query_result); g_free(port_id); g_free(trace_range); @@ -2564,7 +2545,6 @@ int cmd_run_ctx_connect_comp_ports(struct cmd_run_ctx *ctx, uint64_t i; count = port_count_fn(comp); - BT_ASSERT(count >= 0); for (i = 0; i < count; i++) { const bt_port_output *upstream_port = port_by_index_fn(comp, i);