Remove `PLUGIN` from component class log level environment variables
[babeltrace.git] / cli / babeltrace.c
index ae8aacfc0322722689f5e0c79c4d1cb82f9fe375..56e32714710c68e524e855d5dcb56349c93bda85 100644 (file)
 #include "logging.h"
 
 #include <babeltrace/babeltrace.h>
-#include <babeltrace/plugin/plugin.h>
 #include <babeltrace/common-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/component-source.h>
-#include <babeltrace/graph/component-sink.h>
-#include <babeltrace/graph/component-filter.h>
-#include <babeltrace/graph/component-class.h>
-#include <babeltrace/graph/port.h>
-#include <babeltrace/graph/graph.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/ref.h>
-#include <babeltrace/values.h>
-#include <babeltrace/logging.h>
+#include <babeltrace/values-internal.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <popt.h>
  */
 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 <windows.h>
+
+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,6 +148,116 @@ 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;
+
+       assert(fail_reason);
+       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)
 {
@@ -292,6 +438,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 +450,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 +501,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 +547,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
@@ -593,10 +761,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 +862,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 +897,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 +921,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);
@@ -853,9 +1035,8 @@ int cmd_help(struct bt_config *cfg)
                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,6 +1155,7 @@ 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;
 
        assert(cfg->cmd_data.print_lttng_live_sessions.url);
        comp_cls = find_component_class(plugin_name, comp_cls_name,
@@ -1004,15 +1186,9 @@ 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;
        }
 
        if (!bt_value_is_array(results)) {
@@ -1081,6 +1257,20 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg)
 
                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);
@@ -1088,10 +1278,6 @@ end:
        bt_put(params);
        bt_put(comp_cls);
        return 0;
-
-error:
-       ret = -1;
-       goto end;
 }
 
 static
@@ -1107,6 +1293,7 @@ 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;
 
        assert(cfg->cmd_data.print_ctf_metadata.path);
        comp_cls = find_component_class(plugin_name, comp_cls_name,
@@ -1140,16 +1327,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");
@@ -1162,8 +1342,19 @@ 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);
+       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);
@@ -1421,8 +1612,8 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component(
                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;
                }
@@ -1561,23 +1752,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;
@@ -1635,7 +1827,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;
                }
 
@@ -1810,28 +2002,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,6 +2062,7 @@ 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)) {
@@ -1901,10 +2094,11 @@ int set_stream_intersections(struct cmd_run_ctx *ctx,
                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;
@@ -2592,21 +2786,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;
@@ -2614,7 +2793,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);
 
This page took 0.030513 seconds and 4 git commands to generate.