X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2Fbabeltrace.c;h=ce12900a0e97929b43a32574419fa531acbb15a7;hb=f6ccaed94e575af57fe6bf38154771bee4871a2a;hp=7c98cdf00b3c667f50376b3444050799cf6e2ae8;hpb=33ec5dfa4f2fc8c23ddfdda61d5c69e1ae1875ea;p=babeltrace.git diff --git a/cli/babeltrace.c b/cli/babeltrace.c index 7c98cdf0..ce12900a 100644 --- a/cli/babeltrace.c +++ b/cli/babeltrace.c @@ -30,20 +30,8 @@ #include "logging.h" #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include #include @@ -67,27 +55,55 @@ */ static const char* log_level_env_var_names[] = { "BABELTRACE_COMMON_LOG_LEVEL", + "BABELTRACE_COMPAT_LOG_LEVEL", "BABELTRACE_PLUGIN_CTF_BTR_LOG_LEVEL", - "BABELTRACE_PLUGIN_CTF_FS_SRC_LOG_LEVEL", - "BABELTRACE_PLUGIN_CTF_LTTNG_LIVE_SRC_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_NOTIF_ITER_LOG_LEVEL", - "BABELTRACE_PLUGIN_LTTNG_UTILS_DEBUG_INFO_FLT_LOG_LEVEL", - "BABELTRACE_PLUGIN_TEXT_DMESG_SRC_LOG_LEVEL", - "BABELTRACE_PLUGIN_UTILS_MUXER_FLT_LOG_LEVEL", - "BABELTRACE_PLUGIN_UTILS_TRIMMER_FLT_LOG_LEVEL", + "BABELTRACE_PLUGIN_CTFCOPYTRACE_LIB_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_MUXER_LOG_LEVEL", + "BABELTRACE_FLT_UTILS_TRIMMER_LOG_LEVEL", + "BABELTRACE_PYTHON_BT2_LOG_LEVEL", "BABELTRACE_PYTHON_PLUGIN_PROVIDER_LOG_LEVEL", NULL, }; /* Application's processing graph (weak) */ static struct bt_graph *the_graph; +static struct bt_query_executor *the_query_executor; static bool canceled = false; GPtrArray *loaded_plugins; +#ifdef __MINGW32__ +#include + +static +BOOL WINAPI signal_handler(DWORD signal) { + if (the_graph) { + bt_graph_cancel(the_graph); + } + + canceled = true; + + return TRUE; +} + +static +void set_signal_handler(void) +{ + if (!SetConsoleCtrlHandler(signal_handler, TRUE)) { + BT_LOGE("Failed to set the ctrl+c handler."); + } +} +#else /* __MINGW32__ */ static -void sigint_handler(int signum) +void signal_handler(int signum) { if (signum != SIGINT) { return; @@ -97,9 +113,29 @@ void sigint_handler(int signum) bt_graph_cancel(the_graph); } + if (the_query_executor) { + bt_query_executor_cancel(the_query_executor); + } + canceled = true; } +static +void set_signal_handler(void) +{ + struct sigaction new_action, old_action; + + new_action.sa_handler = signal_handler; + sigemptyset(&new_action.sa_mask); + new_action.sa_flags = 0; + sigaction(SIGINT, NULL, &old_action); + + if (old_action.sa_handler != SIG_IGN) { + sigaction(SIGINT, &new_action, NULL); + } +} +#endif /* __MINGW32__ */ + static void init_static_data(void) { @@ -112,13 +148,123 @@ void fini_static_data(void) g_ptr_array_free(loaded_plugins, TRUE); } +static +int create_the_query_executor(void) +{ + int ret = 0; + + the_query_executor = bt_query_executor_create(); + if (!the_query_executor) { + BT_LOGE_STR("Cannot create a query executor."); + ret = -1; + } + + return ret; +} + +static +void destroy_the_query_executor(void) +{ + BT_PUT(the_query_executor); +} + +static +int query(struct bt_component_class *comp_cls, const char *obj, + struct bt_value *params, struct bt_value **user_result, + const char **fail_reason) +{ + struct bt_value *result = NULL; + enum bt_query_status status; + *fail_reason = "unknown error"; + int ret = 0; + + BT_ASSERT(fail_reason); + BT_ASSERT(user_result); + ret = create_the_query_executor(); + if (ret) { + /* create_the_query_executor() logs errors */ + goto end; + } + + if (canceled) { + BT_LOGI("Canceled by user before executing the query: " + "comp-cls-addr=%p, comp-cls-name=\"%s\", " + "query-obj=\"%s\"", comp_cls, + bt_component_class_get_name(comp_cls), obj); + *fail_reason = "canceled by user"; + goto error; + } + + while (true) { + status = bt_query_executor_query(the_query_executor, comp_cls, + obj, params, &result); + switch (status) { + case BT_QUERY_STATUS_OK: + goto ok; + case BT_QUERY_STATUS_AGAIN: + { + const uint64_t sleep_time_us = 100000; + + /* Wait 100 ms and retry */ + BT_LOGV("Got BT_QUERY_STATUS_AGAIN: sleeping: " + "time-us=%" PRIu64, sleep_time_us); + + if (usleep(sleep_time_us)) { + if (bt_query_executor_is_canceled(the_query_executor)) { + BT_LOGI("Query was canceled by user: " + "comp-cls-addr=%p, comp-cls-name=\"%s\", " + "query-obj=\"%s\"", comp_cls, + bt_component_class_get_name(comp_cls), + obj); + *fail_reason = "canceled by user"; + goto error; + } + } + + continue; + } + case BT_QUERY_STATUS_EXECUTOR_CANCELED: + *fail_reason = "canceled by user"; + goto error; + case BT_QUERY_STATUS_ERROR: + case BT_QUERY_STATUS_INVALID: + goto error; + case BT_QUERY_STATUS_INVALID_OBJECT: + *fail_reason = "invalid or unknown query object"; + goto error; + case BT_QUERY_STATUS_INVALID_PARAMS: + *fail_reason = "invalid query parameters"; + goto error; + case BT_QUERY_STATUS_NOMEM: + *fail_reason = "not enough memory"; + goto error; + default: + BT_LOGF("Unknown query status: status=%d", status); + abort(); + } + } + +ok: + *user_result = result; + result = NULL; + goto end; + +error: + ret = -1; + +end: + destroy_the_query_executor(); + bt_put(result); + return ret; +} + static struct bt_plugin *find_plugin(const char *name) { int i; struct bt_plugin *plugin = NULL; - assert(name); + BT_ASSERT(name); BT_LOGD("Finding plugin: name=\"%s\"", name); for (i = 0; i < loaded_plugins->len; i++) { @@ -260,6 +406,7 @@ bt_bool print_map_value(const char *key, struct bt_value *object, void *data) print_indent(print_map_value_data->fp, print_map_value_data->indent); fprintf(print_map_value_data->fp, "%s: ", key); + BT_ASSERT(object); if (bt_value_is_array(object) && bt_value_array_is_empty(object)) { @@ -292,6 +439,7 @@ void print_value_rec(FILE *fp, struct bt_value *value, size_t indent) const char *str_val; int size; int i; + enum bt_value_status status; if (!value) { return; @@ -303,32 +451,46 @@ void print_value_rec(FILE *fp, struct bt_value *value, size_t indent) bt_common_color_reset()); break; case BT_VALUE_TYPE_BOOL: - bt_value_bool_get(value, &bool_val); + status = bt_value_bool_get(value, &bool_val); + if (status != BT_VALUE_STATUS_OK) { + goto error; + } fprintf(fp, "%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); + status = bt_value_integer_get(value, &int_val); + if (status != BT_VALUE_STATUS_OK) { + goto error; + } fprintf(fp, "%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); + status = bt_value_float_get(value, &dbl_val); + if (status != BT_VALUE_STATUS_OK) { + goto error; + } fprintf(fp, "%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); + status = bt_value_string_get(value, &str_val); + if (status != BT_VALUE_STATUS_OK) { + goto error; + } fprintf(fp, "%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); - assert(size >= 0); + if (size < 0) { + goto error; + } if (size == 0) { print_indent(fp, indent); @@ -340,7 +502,9 @@ void print_value_rec(FILE *fp, struct bt_value *value, size_t indent) struct bt_value *element = bt_value_array_get(value, i); - assert(element); + if (!element) { + goto error; + } print_indent(fp, indent); fprintf(fp, "- "); @@ -384,6 +548,11 @@ void print_value_rec(FILE *fp, struct bt_value *value, size_t indent) default: abort(); } + return; + +error: + BT_LOGE("Error printing value of type %s.", + bt_value_type_string(bt_value_get_type(value))); } static @@ -546,7 +715,7 @@ void add_to_loaded_plugins(struct bt_plugin_set *plugin_set) int64_t count; count = bt_plugin_set_get_plugin_count(plugin_set); - assert(count >= 0); + BT_ASSERT(count >= 0); for (i = 0; i < count; i++) { struct bt_plugin *plugin = @@ -554,7 +723,7 @@ void add_to_loaded_plugins(struct bt_plugin_set *plugin_set) struct bt_plugin *loaded_plugin = find_plugin(bt_plugin_get_name(plugin)); - assert(plugin); + BT_ASSERT(plugin); if (loaded_plugin) { BT_LOGI("Not using plugin: another one already exists with the same name: " @@ -593,10 +762,15 @@ int load_dynamic_plugins(struct bt_value *plugin_paths) struct bt_value *plugin_path_value = NULL; const char *plugin_path; struct bt_plugin_set *plugin_set; + enum bt_value_status status; plugin_path_value = bt_value_array_get(plugin_paths, i); - bt_value_string_get(plugin_path_value, &plugin_path); - assert(plugin_path); + status = bt_value_string_get(plugin_path_value, &plugin_path); + if (status != BT_VALUE_STATUS_OK) { + BT_LOGD_STR("Cannot get plugin path string."); + BT_PUT(plugin_path_value); + continue; + } /* * Skip this if the directory does not exist because @@ -689,8 +863,12 @@ void print_plugin_info(struct bt_plugin *plugin) printf("%s%s%s%s:\n", bt_common_color_bold(), bt_common_color_fg_blue(), plugin_name, bt_common_color_reset()); - printf(" %sPath%s: %s\n", bt_common_color_bold(), - bt_common_color_reset(), path ? path : "(None)"); + if (path) { + printf(" %sPath%s: %s\n", bt_common_color_bold(), + bt_common_color_reset(), path); + } else { + puts(" Built-in"); + } if (version_status == BT_PLUGIN_STATUS_OK) { printf(" %sVersion%s: %u.%u.%u", @@ -720,6 +898,7 @@ int cmd_query(struct bt_config *cfg) int ret = 0; struct bt_component_class *comp_cls = NULL; struct bt_value *results = NULL; + const char *fail_reason = NULL; comp_cls = find_component_class(cfg->cmd_data.query.cfg_component->plugin_name->str, cfg->cmd_data.query.cfg_component->comp_cls_name->str, @@ -743,35 +922,39 @@ int cmd_query(struct bt_config *cfg) goto end; } - results = bt_component_class_query(comp_cls, - cfg->cmd_data.query.object->str, - cfg->cmd_data.query.cfg_component->params); - if (!results) { - BT_LOGE("Failed to query component class: plugin-name=\"%s\", " - "comp-cls-name=\"%s\", comp-cls-type=%d " - "object=\"%s\"", - cfg->cmd_data.query.cfg_component->plugin_name->str, - cfg->cmd_data.query.cfg_component->comp_cls_name->str, - cfg->cmd_data.query.cfg_component->type, - cfg->cmd_data.query.object->str); - 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.cfg_component->plugin_name->str, - cfg->cmd_data.query.cfg_component->comp_cls_name->str, - cfg->cmd_data.query.cfg_component->type); - fprintf(stderr, "%s%s with object `%s`%s\n", - bt_common_color_bold(), - bt_common_color_fg_red(), - cfg->cmd_data.query.object->str, - bt_common_color_reset()); - ret = -1; - goto end; + ret = query(comp_cls, cfg->cmd_data.query.object->str, + cfg->cmd_data.query.cfg_component->params, &results, + &fail_reason); + if (ret) { + goto failed; } print_value(stdout, results, 0); + goto end; + +failed: + BT_LOGE("Failed to query component class: %s: plugin-name=\"%s\", " + "comp-cls-name=\"%s\", comp-cls-type=%d " + "object=\"%s\"", fail_reason, + cfg->cmd_data.query.cfg_component->plugin_name->str, + cfg->cmd_data.query.cfg_component->comp_cls_name->str, + cfg->cmd_data.query.cfg_component->type, + cfg->cmd_data.query.object->str); + 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.cfg_component->plugin_name->str, + cfg->cmd_data.query.cfg_component->comp_cls_name->str, + cfg->cmd_data.query.cfg_component->type); + fprintf(stderr, "%s%s with object `%s`: %s%s\n", + bt_common_color_bold(), + bt_common_color_fg_red(), + cfg->cmd_data.query.object->str, + fail_reason, + bt_common_color_reset()); + ret = -1; end: bt_put(comp_cls); @@ -848,14 +1031,13 @@ int cmd_help(struct bt_config *cfg) enum bt_component_class_type type = bt_component_class_get_type(comp_cls); - assert(comp_cls); + BT_ASSERT(comp_cls); if (cfg->cmd_data.help.cfg_component->type != BT_COMPONENT_CLASS_TYPE_UNKNOWN) { if (strcmp(cfg->cmd_data.help.cfg_component->comp_cls_name->str, - comp_class_name) != 0 && - type == - cfg->cmd_data.help.cfg_component->type) { + comp_class_name) != 0 || + type != cfg->cmd_data.help.cfg_component->type) { bt_put(comp_cls); continue; } @@ -974,8 +1156,10 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg) static const enum bt_component_class_type comp_cls_type = BT_COMPONENT_CLASS_TYPE_SOURCE; int64_t array_size, i; + const char *fail_reason = NULL; + FILE *out_stream = stdout; - assert(cfg->cmd_data.print_lttng_live_sessions.url); + BT_ASSERT(cfg->cmd_data.print_lttng_live_sessions.url); comp_cls = find_component_class(plugin_name, comp_cls_name, comp_cls_type); if (!comp_cls) { @@ -1004,17 +1188,13 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg) goto error; } - results = bt_component_class_query(comp_cls, "sessions", - params); - if (!results) { - BT_LOGE_STR("Failed to query for sessions."); - fprintf(stderr, "%s%sFailed to request sessions%s\n", - bt_common_color_bold(), - bt_common_color_fg_red(), - bt_common_color_reset()); - goto error; + ret = query(comp_cls, "sessions", params, &results, &fail_reason); + if (ret) { + goto failed; } + BT_ASSERT(results); + if (!bt_value_is_array(results)) { BT_LOGE_STR("Expecting an array for sessions query."); fprintf(stderr, "%s%sUnexpected type returned by session query%s\n", @@ -1024,6 +1204,19 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg) goto error; } + if (cfg->cmd_data.print_lttng_live_sessions.output_path->len > 0) { + out_stream = + fopen(cfg->cmd_data.print_lttng_live_sessions.output_path->str, + "w"); + if (!out_stream) { + ret = -1; + BT_LOGE_ERRNO("Cannot open file for writing", + ": path=\"%s\"", + cfg->cmd_data.print_lttng_live_sessions.output_path->str); + goto end; + } + } + array_size = bt_value_array_size(results); for (i = 0; i < array_size; i++) { const char *url_text; @@ -1045,8 +1238,8 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg) goto error; } ret = bt_value_string_get(v, &url_text); - assert(ret == 0); - printf("%s", url_text); + BT_ASSERT(ret == 0); + fprintf(out_stream, "%s", url_text); BT_PUT(v); v = bt_value_map_get(map, "timer-us"); @@ -1055,8 +1248,8 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg) goto error; } ret = bt_value_integer_get(v, &timer_us); - assert(ret == 0); - printf(" (timer = %" PRIu64 ", ", timer_us); + BT_ASSERT(ret == 0); + fprintf(out_stream, " (timer = %" PRIu64 ", ", timer_us); BT_PUT(v); v = bt_value_map_get(map, "stream-count"); @@ -1065,8 +1258,8 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg) goto error; } ret = bt_value_integer_get(v, &streams); - assert(ret == 0); - printf("%" PRIu64 " stream(s), ", streams); + BT_ASSERT(ret == 0); + fprintf(out_stream, "%" PRIu64 " stream(s), ", streams); BT_PUT(v); v = bt_value_map_get(map, "client-count"); @@ -1075,23 +1268,44 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg) goto error; } ret = bt_value_integer_get(v, &clients); - assert(ret == 0); - printf("%" PRIu64 " client(s) connected)\n", clients); + BT_ASSERT(ret == 0); + fprintf(out_stream, "%" PRIu64 " client(s) connected)\n", clients); BT_PUT(v); BT_PUT(map); } + + goto end; + +failed: + BT_LOGE("Failed to query for sessions: %s", fail_reason); + fprintf(stderr, "%s%sFailed to request sessions: %s%s\n", + bt_common_color_bold(), + bt_common_color_fg_red(), + fail_reason, + bt_common_color_reset()); + +error: + ret = -1; + end: bt_put(v); bt_put(map); bt_put(results); bt_put(params); bt_put(comp_cls); - return 0; -error: - ret = -1; - goto end; + if (out_stream && out_stream != stdout) { + int fclose_ret = fclose(out_stream); + + if (fclose_ret) { + BT_LOGE_ERRNO("Cannot close file stream", + ": path=\"%s\"", + cfg->cmd_data.print_lttng_live_sessions.output_path->str); + } + } + + return 0; } static @@ -1107,8 +1321,10 @@ int cmd_print_ctf_metadata(struct bt_config *cfg) static const char * const comp_cls_name = "fs"; static const enum bt_component_class_type comp_cls_type = BT_COMPONENT_CLASS_TYPE_SOURCE; + const char *fail_reason = NULL; + FILE *out_stream = stdout; - assert(cfg->cmd_data.print_ctf_metadata.path); + BT_ASSERT(cfg->cmd_data.print_ctf_metadata.path); comp_cls = find_component_class(plugin_name, comp_cls_name, comp_cls_type); if (!comp_cls) { @@ -1140,16 +1356,9 @@ int cmd_print_ctf_metadata(struct bt_config *cfg) goto end; } - results = bt_component_class_query(comp_cls, "metadata-info", - params); - if (!results) { - ret = -1; - BT_LOGE_STR("Failed to query for metadata info."); - fprintf(stderr, "%s%sFailed to request metadata info%s\n", - bt_common_color_bold(), - bt_common_color_fg_red(), - bt_common_color_reset()); - goto end; + ret = query(comp_cls, "metadata-info", params, &results, &fail_reason); + if (ret) { + goto failed; } metadata_text_value = bt_value_map_get(results, "text"); @@ -1160,14 +1369,55 @@ int cmd_print_ctf_metadata(struct bt_config *cfg) } ret = bt_value_string_get(metadata_text_value, &metadata_text); - assert(ret == 0); - printf("%s\n", metadata_text); + BT_ASSERT(ret == 0); + + if (cfg->cmd_data.print_ctf_metadata.output_path->len > 0) { + out_stream = + fopen(cfg->cmd_data.print_ctf_metadata.output_path->str, + "w"); + if (!out_stream) { + ret = -1; + BT_LOGE_ERRNO("Cannot open file for writing", + ": path=\"%s\"", + cfg->cmd_data.print_ctf_metadata.output_path->str); + goto end; + } + } + + ret = fprintf(out_stream, "%s\n", metadata_text); + if (ret < 0) { + BT_LOGE("Cannot write whole metadata text to output stream: " + "ret=%d", ret); + } + + goto end; + +failed: + ret = -1; + BT_LOGE("Failed to query for metadata info: %s", fail_reason); + fprintf(stderr, "%s%sFailed to request metadata info: %s%s\n", + bt_common_color_bold(), + bt_common_color_fg_red(), + fail_reason, + bt_common_color_reset()); end: + destroy_the_query_executor(); bt_put(results); bt_put(params); bt_put(metadata_text_value); bt_put(comp_cls); + + if (out_stream && out_stream != stdout) { + int fclose_ret = fclose(out_stream); + + if (fclose_ret) { + BT_LOGE_ERRNO("Cannot close file stream", + ": path=\"%s\"", + cfg->cmd_data.print_ctf_metadata.output_path->str); + } + } + return 0; } @@ -1186,8 +1436,8 @@ guint port_id_hash(gconstpointer v) { const struct port_id *id = v; - assert(id->instance_name); - assert(id->port_name); + BT_ASSERT(id->instance_name); + BT_ASSERT(id->port_name); return g_str_hash(id->instance_name) ^ g_str_hash(id->port_name); } @@ -1366,7 +1616,7 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component( cfg_conn->arg->str); downstreamp_comp_name_quark = g_quark_from_string( cfg_conn->downstream_comp_name->str); - assert(downstreamp_comp_name_quark > 0); + BT_ASSERT(downstreamp_comp_name_quark > 0); downstream_comp = g_hash_table_lookup(ctx->components, GUINT_TO_POINTER(downstreamp_comp_name_quark)); if (!downstream_comp) { @@ -1395,7 +1645,7 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component( } downstream_port_count = port_count_fn(downstream_comp); - assert(downstream_port_count >= 0); + BT_ASSERT(downstream_port_count >= 0); for (i = 0; i < downstream_port_count; i++) { struct bt_port *downstream_port = @@ -1403,7 +1653,7 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component( const char *upstream_port_name; const char *downstream_port_name; - assert(downstream_port); + BT_ASSERT(downstream_port); /* Skip port if it's already connected. */ if (bt_port_is_connected(downstream_port)) { @@ -1416,13 +1666,13 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component( } downstream_port_name = bt_port_get_name(downstream_port); - assert(downstream_port_name); + BT_ASSERT(downstream_port_name); upstream_port_name = bt_port_get_name(upstream_port); - assert(upstream_port_name); + BT_ASSERT(upstream_port_name); if (!bt_common_star_glob_match( - cfg_conn->downstream_port_glob->str, -1ULL, - downstream_port_name, -1ULL)) { + cfg_conn->downstream_port_glob->str, SIZE_MAX, + downstream_port_name, SIZE_MAX)) { bt_put(downstream_port); continue; } @@ -1460,7 +1710,7 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component( if (graph_status != BT_GRAPH_STATUS_OK) { goto error; } - assert(trimmer); + BT_ASSERT(trimmer); trimmer_input = bt_component_filter_get_input_port_by_index( @@ -1561,23 +1811,24 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component( } ctx->connect_ports = true; } - goto end; - } - if (status != BT_GRAPH_STATUS_OK) { - BT_LOGE("Cannot create connection: cannot find a matching downstream port for upstream port: " - "upstream-port-addr=%p, upstream-port-name=\"%s\", " - "downstream-comp-name=\"%s\", conn-arg=\"%s\"", - upstream_port, bt_port_get_name(upstream_port), - cfg_conn->downstream_comp_name->str, - cfg_conn->arg->str); - fprintf(stderr, - "Cannot create connection: cannot find a matching downstream port for upstream port `%s`: %s\n", - bt_port_get_name(upstream_port), cfg_conn->arg->str); - goto error; + /* + * We found a matching downstream port: the search is + * over. + */ + goto end; } - goto end; + /* No downstream port found */ + BT_LOGE("Cannot create connection: cannot find a matching downstream port for upstream port: " + "upstream-port-addr=%p, upstream-port-name=\"%s\", " + "downstream-comp-name=\"%s\", conn-arg=\"%s\"", + upstream_port, bt_port_get_name(upstream_port), + cfg_conn->downstream_comp_name->str, + cfg_conn->arg->str); + fprintf(stderr, + "Cannot create connection: cannot find a matching downstream port for upstream port `%s`: %s\n", + bt_port_get_name(upstream_port), cfg_conn->arg->str); error: ret = -1; @@ -1603,10 +1854,10 @@ int cmd_run_ctx_connect_upstream_port(struct cmd_run_ctx *ctx, struct bt_component *upstream_comp = NULL; size_t i; - assert(ctx); - assert(upstream_port); + BT_ASSERT(ctx); + BT_ASSERT(upstream_port); upstream_port_name = bt_port_get_name(upstream_port); - assert(upstream_port_name); + BT_ASSERT(upstream_port_name); upstream_comp = bt_port_get_component(upstream_port); if (!upstream_comp) { BT_LOGW("Upstream port to connect is not part of a component: " @@ -1617,7 +1868,7 @@ int cmd_run_ctx_connect_upstream_port(struct cmd_run_ctx *ctx, } upstream_comp_name = bt_component_get_name(upstream_comp); - assert(upstream_comp_name); + BT_ASSERT(upstream_comp_name); BT_LOGI("Connecting upstream port: comp-addr=%p, comp-name=\"%s\", " "port-addr=%p, port-name=\"%s\"", upstream_comp, upstream_comp_name, @@ -1635,7 +1886,7 @@ int cmd_run_ctx_connect_upstream_port(struct cmd_run_ctx *ctx, if (!bt_common_star_glob_match( cfg_conn->upstream_port_glob->str, - -1ULL, upstream_port_name, -1ULL)) { + SIZE_MAX, upstream_port_name, SIZE_MAX)) { continue; } @@ -1730,8 +1981,8 @@ void graph_ports_connected_listener(struct bt_port *upstream_port, struct bt_component *upstream_comp = bt_port_get_component(upstream_port); struct bt_component *downstream_comp = bt_port_get_component(downstream_port); - assert(upstream_comp); - assert(downstream_comp); + BT_ASSERT(upstream_comp); + BT_ASSERT(downstream_comp); BT_LOGI("Graph's component ports connected: " "upstream-comp-addr=%p, upstream-comp-name=\"%s\", " "upstream-port-addr=%p, upstream-port-name=\"%s\", " @@ -1810,28 +2061,28 @@ int cmd_run_ctx_init(struct cmd_run_ctx *ctx, struct bt_config *cfg) the_graph = ctx->graph; ret = bt_graph_add_port_added_listener(ctx->graph, - graph_port_added_listener, ctx); + graph_port_added_listener, NULL, ctx); if (ret < 0) { BT_LOGE_STR("Cannot add \"port added\" listener to graph."); goto error; } ret = bt_graph_add_port_removed_listener(ctx->graph, - graph_port_removed_listener, ctx); + graph_port_removed_listener, NULL, ctx); if (ret < 0) { BT_LOGE_STR("Cannot add \"port removed\" listener to graph."); goto error; } ret = bt_graph_add_ports_connected_listener(ctx->graph, - graph_ports_connected_listener, ctx); + graph_ports_connected_listener, NULL, ctx); if (ret < 0) { BT_LOGE_STR("Cannot add \"ports connected\" listener to graph."); goto error; } ret = bt_graph_add_ports_disconnected_listener(ctx->graph, - graph_ports_disconnected_listener, ctx); + graph_ports_disconnected_listener, NULL, ctx); if (ret < 0) { BT_LOGE_STR("Cannot add \"ports disconnected\" listener to graph."); goto error; @@ -1870,9 +2121,10 @@ int set_stream_intersections(struct cmd_run_ctx *ctx, struct bt_value *stream_info = NULL; struct port_id *port_id = NULL; struct trace_range *trace_range = NULL; + const char *fail_reason = NULL; component_path_value = bt_value_map_get(cfg_comp->params, "path"); - if (!bt_value_is_string(component_path_value)) { + 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; @@ -1896,20 +2148,23 @@ int set_stream_intersections(struct cmd_run_ctx *ctx, value_status = bt_value_map_insert(query_params, "path", component_path_value); if (value_status != BT_VALUE_STATUS_OK) { - BT_LOGE_STR("Cannot insert path parameter in query paramater map."); + BT_LOGE_STR("Cannot insert path parameter in query parameter map."); ret = -1; goto error; } - query_result = bt_component_class_query(comp_cls, "trace-info", - query_params); - if (!query_result) { - BT_LOGD("Component class \'%s\' does not support the \'trace-info\' query.", + ret = query(comp_cls, "trace-info", query_params, &query_result, + &fail_reason); + if (ret) { + BT_LOGD("Component class does not support the `trace-info` query: %s: " + "comp-class-name=\"%s\"", fail_reason, bt_component_class_get_name(comp_cls)); ret = -1; goto error; } + BT_ASSERT(query_result); + if (!bt_value_is_array(query_result)) { BT_LOGD("Unexpected format of \'trace-info\' query result: " "component-class-name=%s", @@ -1986,7 +2241,7 @@ int set_stream_intersections(struct cmd_run_ctx *ctx, stream_infos = bt_value_map_get(trace_info, "streams"); if (!stream_infos || !bt_value_is_array(stream_infos)) { ret = -1; - BT_LOGD_STR("Cannot retrieve stream informations from trace in query result."); + BT_LOGD_STR("Cannot retrieve stream information from trace in query result."); goto error; } @@ -2010,7 +2265,6 @@ int set_stream_intersections(struct cmd_run_ctx *ctx, */ for (stream_idx = 0; stream_idx < stream_count; stream_idx++) { const char *stream_path; - gboolean hash_ret; port_id = g_new0(struct port_id, 1); if (!port_id) { @@ -2073,9 +2327,7 @@ int set_stream_intersections(struct cmd_run_ctx *ctx, BT_LOGD("Inserting stream intersection "); - hash_ret = g_hash_table_insert(ctx->intersections, - port_id, trace_range); - assert(hash_ret); + g_hash_table_insert(ctx->intersections, port_id, trace_range); port_id = NULL; trace_range = NULL; @@ -2181,7 +2433,7 @@ int cmd_run_ctx_create_components_from_config_components( BT_LOGI("Created and inserted component: comp-addr=%p, comp-name=\"%s\"", comp, cfg_comp->instance_name->str); quark = g_quark_from_string(cfg_comp->instance_name->str); - assert(quark > 0); + BT_ASSERT(quark > 0); g_hash_table_insert(ctx->components, GUINT_TO_POINTER(quark), comp); comp = NULL; @@ -2248,12 +2500,12 @@ int cmd_run_ctx_connect_comp_ports(struct cmd_run_ctx *ctx, uint64_t i; count = port_count_fn(comp); - assert(count >= 0); + BT_ASSERT(count >= 0); for (i = 0; i < count; i++) { struct bt_port *upstream_port = port_by_index_fn(comp, i); - assert(upstream_port); + BT_ASSERT(upstream_port); ret = cmd_run_ctx_connect_upstream_port(ctx, upstream_port); bt_put(upstream_port); if (ret) { @@ -2576,9 +2828,9 @@ void set_auto_log_levels(struct bt_config *cfg) while (*env_var_name) { if (!getenv(*env_var_name)) { if (cfg->verbose) { - setenv(*env_var_name, "I", 1); + g_setenv(*env_var_name, "I", 1); } else if (cfg->debug) { - setenv(*env_var_name, "V", 1); + g_setenv(*env_var_name, "V", 1); } else { char val[2] = { 0 }; @@ -2587,7 +2839,7 @@ void set_auto_log_levels(struct bt_config *cfg) * explicitly specified. */ val[0] = cfg->log_level; - setenv(*env_var_name, val, 1); + g_setenv(*env_var_name, val, 1); } } @@ -2595,21 +2847,6 @@ void set_auto_log_levels(struct bt_config *cfg) } } -static -void set_sigint_handler(void) -{ - struct sigaction new_action, old_action; - - new_action.sa_handler = sigint_handler; - sigemptyset(&new_action.sa_mask); - new_action.sa_flags = 0; - sigaction(SIGINT, NULL, &old_action); - - if (old_action.sa_handler != SIG_IGN) { - sigaction(SIGINT, &new_action, NULL); - } -} - int main(int argc, const char **argv) { int ret; @@ -2617,7 +2854,7 @@ int main(int argc, const char **argv) struct bt_config *cfg; init_log_level(); - set_sigint_handler(); + set_signal_handler(); init_static_data(); cfg = bt_config_cli_args_create_with_default(argc, argv, &retcode);