the_query_executor = bt_query_executor_create();
if (!the_query_executor) {
- BT_LOGE_STR("Cannot create a query executor.");
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot create a query executor.");
ret = -1;
}
const bt_value **user_result, const char **fail_reason)
{
const bt_value *result = NULL;
- bt_query_executor_status status;
+ bt_query_executor_query_status query_status;
*fail_reason = "unknown error";
int ret = 0;
}
while (true) {
- status = bt_query_executor_query(the_query_executor,
- comp_cls, obj, params, cfg->log_level, &result);
- switch (status) {
- case BT_QUERY_EXECUTOR_STATUS_OK:
+ query_status = bt_query_executor_query(
+ the_query_executor, comp_cls, obj, params,
+ cfg->log_level, &result);
+ switch (query_status) {
+ case BT_QUERY_EXECUTOR_QUERY_STATUS_OK:
goto ok;
- case BT_QUERY_EXECUTOR_STATUS_AGAIN:
+ case BT_QUERY_EXECUTOR_QUERY_STATUS_AGAIN:
{
const uint64_t sleep_time_us = 100000;
/* Wait 100 ms and retry */
- BT_LOGD("Got BT_QUERY_EXECUTOR_STATUS_AGAIN: sleeping: "
+ BT_LOGD("Got BT_QUERY_EXECUTOR_QUERY_STATUS_AGAIN: sleeping: "
"time-us=%" PRIu64, sleep_time_us);
if (usleep(sleep_time_us)) {
continue;
}
- case BT_QUERY_EXECUTOR_STATUS_CANCELED:
+ case BT_QUERY_EXECUTOR_QUERY_STATUS_CANCELED:
*fail_reason = "canceled by user";
goto error;
- case BT_QUERY_EXECUTOR_STATUS_ERROR:
+ case BT_QUERY_EXECUTOR_QUERY_STATUS_ERROR:
goto error;
- case BT_QUERY_EXECUTOR_STATUS_INVALID_OBJECT:
+ case BT_QUERY_EXECUTOR_QUERY_STATUS_INVALID_OBJECT:
*fail_reason = "invalid or unknown query object";
goto error;
- case BT_QUERY_EXECUTOR_STATUS_INVALID_PARAMS:
+ case BT_QUERY_EXECUTOR_QUERY_STATUS_INVALID_PARAMS:
*fail_reason = "invalid query parameters";
goto error;
- case BT_QUERY_EXECUTOR_STATUS_UNSUPPORTED:
+ case BT_QUERY_EXECUTOR_QUERY_STATUS_UNSUPPORTED:
*fail_reason = "unsupported action";
goto error;
- case BT_QUERY_EXECUTOR_STATUS_NOMEM:
+ case BT_QUERY_EXECUTOR_QUERY_STATUS_MEMORY_ERROR:
*fail_reason = "not enough memory";
goto error;
default:
- BT_LOGF("Unknown query status: status=%d", status);
+ BT_LOGF("Unknown query status: status=%s",
+ bt_common_func_status_string(query_status));
abort();
}
}
nr_paths = bt_value_array_get_size(plugin_paths);
if (nr_paths < 0) {
- BT_LOGE_STR("Cannot load dynamic plugins: no plugin path.");
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot load dynamic plugins: no plugin path.");
ret = -1;
goto end;
}
for (i = 0; i < nr_paths; i++) {
const bt_value *plugin_path_value = NULL;
const char *plugin_path;
- const bt_plugin_set *plugin_set;
+ const bt_plugin_set *plugin_set = NULL;
+ bt_plugin_find_all_from_dir_status status;
plugin_path_value =
bt_value_array_borrow_element_by_index_const(
continue;
}
- plugin_set = bt_plugin_find_all_from_dir(plugin_path, false);
- if (!plugin_set) {
- BT_LOGI("Unable to load dynamic plugins from directory: "
+ status = bt_plugin_find_all_from_dir(plugin_path, BT_FALSE,
+ BT_FALSE, &plugin_set);
+ if (status < 0) {
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Unable to load dynamic plugins from directory: "
"path=\"%s\"", plugin_path);
+ ret = -1;
+ goto end;
+ } else if (status ==
+ BT_PLUGIN_FIND_ALL_FROM_DIR_STATUS_NOT_FOUND) {
+ BT_LOGI("No plugins found in directory: path=\"%s\"",
+ plugin_path);
continue;
}
+ BT_ASSERT(status == BT_PLUGIN_FIND_ALL_FROM_DIR_STATUS_OK);
+ BT_ASSERT(plugin_set);
add_to_loaded_plugins(plugin_set);
bt_plugin_set_put_ref(plugin_set);
}
{
int ret = 0;
const bt_plugin_set *plugin_set;
+ bt_plugin_find_all_from_static_status status;
BT_LOGI("Loading static plugins.");
- plugin_set = bt_plugin_find_all_from_static();
- if (!plugin_set) {
- BT_LOGE("Unable to load static plugins.");
+ status = bt_plugin_find_all_from_static(BT_FALSE, &plugin_set);
+ if (status < 0) {
+ BT_CLI_LOGE_APPEND_CAUSE("Unable to load static plugins.");
ret = -1;
goto end;
+ } else if (status ==
+ BT_PLUGIN_FIND_ALL_FROM_STATIC_STATUS_NOT_FOUND) {
+ BT_LOGI("No static plugins found.");
+ goto end;
}
+ BT_ASSERT(status == BT_PLUGIN_FIND_ALL_FROM_STATIC_STATUS_OK);
+ BT_ASSERT(plugin_set);
add_to_loaded_plugins(plugin_set);
bt_plugin_set_put_ref(plugin_set);
+
end:
return ret;
}
cfg->cmd_data.query.cfg_component->comp_cls_name->str,
cfg->cmd_data.query.cfg_component->type);
if (!comp_cls) {
- BT_LOGE("Cannot find component class: plugin-name=\"%s\", "
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot find component class: plugin-name=\"%s\", "
"comp-cls-name=\"%s\", comp-cls-type=%d",
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%sCannot find component class %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, "\n");
ret = -1;
goto end;
}
goto end;
failed:
- BT_LOGE("Failed to query component class: %s: plugin-name=\"%s\", "
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "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:
plugin = find_plugin(cfg->cmd_data.help.cfg_component->plugin_name->str);
if (!plugin) {
- BT_LOGE("Cannot find plugin: plugin-name=\"%s\"",
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot find plugin: plugin-name=\"%s\"",
cfg->cmd_data.help.cfg_component->plugin_name->str);
- fprintf(stderr, "%s%sCannot find plugin %s%s%s\n",
- bt_common_color_bold(), bt_common_color_fg_red(),
- bt_common_color_fg_blue(),
- cfg->cmd_data.help.cfg_component->plugin_name->str,
- bt_common_color_reset());
ret = -1;
goto end;
}
cfg->cmd_data.help.cfg_component->comp_cls_name->str,
cfg->cmd_data.help.cfg_component->type);
if (!needed_comp_cls) {
- BT_LOGE("Cannot find component class: plugin-name=\"%s\", "
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot find component class: plugin-name=\"%s\", "
"comp-cls-name=\"%s\", comp-cls-type=%d",
cfg->cmd_data.help.cfg_component->plugin_name->str,
cfg->cmd_data.help.cfg_component->comp_cls_name->str,
cfg->cmd_data.help.cfg_component->type);
- fprintf(stderr, "\n%s%sCannot find component class %s",
- bt_common_color_bold(),
- bt_common_color_fg_red(),
- bt_common_color_reset());
- print_plugin_comp_cls_opt(stderr,
- cfg->cmd_data.help.cfg_component->plugin_name->str,
- cfg->cmd_data.help.cfg_component->comp_cls_name->str,
- cfg->cmd_data.help.cfg_component->type);
- fprintf(stderr, "\n");
ret = -1;
goto end;
}
comp_cls = find_component_class(plugin_name, comp_cls_name,
comp_cls_type);
if (!comp_cls) {
- BT_LOGE("Cannot find component class: plugin-name=\"%s\", "
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot find component class: plugin-name=\"%s\", "
"comp-cls-name=\"%s\", comp-cls-type=%d",
plugin_name, comp_cls_name,
BT_COMPONENT_CLASS_TYPE_SOURCE);
- fprintf(stderr, "%s%sCannot find component class %s",
- bt_common_color_bold(),
- bt_common_color_fg_red(),
- bt_common_color_reset());
- print_plugin_comp_cls_opt(stderr, plugin_name,
- comp_cls_name, comp_cls_type);
- fprintf(stderr, "\n");
goto error;
}
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",
- bt_common_color_bold(),
- bt_common_color_fg_red(),
- bt_common_color_reset());
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Expecting an array for LTTng live `sessions` query.");
goto error;
}
BT_LOGE_ERRNO("Cannot open file for writing",
": path=\"%s\"",
cfg->cmd_data.print_lttng_live_sessions.output_path->str);
+ (void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN(
+ "Babeltrace CLI",
+ "Cannot open file for writing: path=\"%s\"",
+ cfg->cmd_data.print_lttng_live_sessions.output_path->str);
goto end;
}
}
map = bt_value_array_borrow_element_by_index_const(results, i);
if (!map) {
- BT_LOGE_STR("Unexpected empty array entry.");
+ BT_CLI_LOGE_APPEND_CAUSE("Unexpected empty array entry.");
goto error;
}
if (!bt_value_is_map(map)) {
- BT_LOGE_STR("Unexpected entry type.");
+ BT_CLI_LOGE_APPEND_CAUSE("Unexpected entry type.");
goto error;
}
v = bt_value_map_borrow_entry_value_const(map, "url");
if (!v) {
- BT_LOGE_STR("Unexpected empty array \"url\" entry.");
+ BT_CLI_LOGE_APPEND_CAUSE("Missing `url` entry.");
goto error;
}
url_text = bt_value_string_get(v);
fprintf(out_stream, "%s", url_text);
v = bt_value_map_borrow_entry_value_const(map, "timer-us");
if (!v) {
- BT_LOGE_STR("Unexpected empty array \"timer-us\" entry.");
+ BT_CLI_LOGE_APPEND_CAUSE("Missing `timer-us` entry.");
goto error;
}
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.");
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Missing `stream-count` entry.");
goto error;
}
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.");
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Missing `client-count` entry.");
goto error;
}
clients = bt_value_signed_integer_get(v);
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());
+ BT_CLI_LOGE_APPEND_CAUSE("Failed to query `sessions` object: %s",
+ fail_reason);
error:
ret = -1;
comp_cls = find_component_class(plugin_name, comp_cls_name,
comp_cls_type);
if (!comp_cls) {
- BT_LOGE("Cannot find component class: plugin-name=\"%s\", "
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot find component class: plugin-name=\"%s\", "
"comp-cls-name=\"%s\", comp-cls-type=%d",
plugin_name, comp_cls_name,
BT_COMPONENT_CLASS_TYPE_SOURCE);
- fprintf(stderr, "%s%sCannot find component class %s",
- bt_common_color_bold(),
- bt_common_color_fg_red(),
- bt_common_color_reset());
- print_plugin_comp_cls_opt(stderr, plugin_name,
- comp_cls_name, comp_cls_type);
- fprintf(stderr, "\n");
ret = -1;
goto end;
}
}
metadata_text_value = bt_value_map_borrow_entry_value_const(results,
- "text");
+ "text");
if (!metadata_text_value) {
- BT_LOGE_STR("Cannot find `text` string value in the resulting metadata info object.");
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot find `text` string value in the resulting metadata info object.");
ret = -1;
goto end;
}
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);
+ (void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN(
+ "Babeltrace CLI",
+ "Cannot open file for writing: path=\"%s\"",
+ cfg->cmd_data.print_ctf_metadata.output_path->str);
+ ret = -1;
goto end;
}
}
ret = fprintf(out_stream, "%s\n", metadata_text);
if (ret < 0) {
- BT_LOGE("Cannot write whole metadata text to output stream: "
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot write whole metadata text to output stream: "
"ret=%d", ret);
goto end;
}
ret = 0;
-
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());
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Failed to query `metadata-info` object: %s", fail_reason);
end:
bt_value_put_ref(results);
uint64_t i;
input_port_count_func_t port_count_fn;
borrow_input_port_by_index_func_t port_by_index_fn;
- bt_graph_status status = BT_GRAPH_STATUS_ERROR;
+ bt_graph_connect_ports_status connect_ports_status =
+ BT_GRAPH_CONNECT_PORTS_STATUS_OK;
bool insert_trimmer = false;
bt_value *trimmer_params = NULL;
char *intersection_begin = NULL;
range = (struct trace_range *) g_hash_table_lookup(
ctx->intersections, &port_id);
if (range) {
- bt_value_status status;
+ bt_value_map_insert_entry_status insert_status;
intersection_begin = s_from_ns(
range->intersection_range_begin_ns);
intersection_end = s_from_ns(
range->intersection_range_end_ns);
if (!intersection_begin || !intersection_end) {
- BT_LOGE_STR("Cannot create trimmer argument timestamp string.");
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot create trimmer argument timestamp string.");
goto error;
}
goto error;
}
- status = bt_value_map_insert_string_entry(
+ insert_status = bt_value_map_insert_string_entry(
trimmer_params, "begin", intersection_begin);
- if (status != BT_VALUE_STATUS_OK) {
+ if (insert_status < 0) {
goto error;
}
- status = bt_value_map_insert_string_entry(
+ insert_status = bt_value_map_insert_string_entry(
trimmer_params,
"end", intersection_end);
- if (status != BT_VALUE_STATUS_OK) {
+ if (insert_status < 0) {
goto error;
}
}
}
if (!downstream_comp) {
- BT_LOGE("Cannot find downstream component: comp-name=\"%s\", "
- "conn-arg=\"%s\"", cfg_conn->downstream_comp_name->str,
- cfg_conn->arg->str);
- fprintf(stderr, "Cannot create connection: cannot find downstream component: %s\n",
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot find downstream component: "
+ "comp-name=\"%s\", conn-arg=\"%s\"",
+ cfg_conn->downstream_comp_name->str,
cfg_conn->arg->str);
goto error;
}
* source and the trimmer.
*/
char *trimmer_name = NULL;
- bt_graph_status graph_status;
+ bt_graph_add_component_status add_comp_status;
ret = asprintf(&trimmer_name,
"stream-intersection-trimmer-%s",
ret = 0;
ctx->connect_ports = false;
- graph_status = bt_graph_add_filter_component(
+ add_comp_status = bt_graph_add_filter_component(
ctx->graph, trimmer_class, trimmer_name,
trimmer_params, ctx->cfg->log_level,
&trimmer);
free(trimmer_name);
- if (graph_status != BT_GRAPH_STATUS_OK) {
+ if (add_comp_status !=
+ BT_GRAPH_ADD_COMPONENT_STATUS_OK) {
goto error;
}
BT_ASSERT(trimmer);
}
/* We have a winner! */
- status = bt_graph_connect_ports(ctx->graph,
+ connect_ports_status = bt_graph_connect_ports(ctx->graph,
out_upstream_port, in_downstream_port, NULL);
downstream_port = NULL;
- switch (status) {
- case BT_GRAPH_STATUS_OK:
+ switch (connect_ports_status) {
+ case BT_GRAPH_CONNECT_PORTS_STATUS_OK:
break;
- case BT_GRAPH_STATUS_CANCELED:
+ case BT_GRAPH_CONNECT_PORTS_STATUS_CANCELED:
BT_LOGI_STR("Graph was canceled by user.");
- status = BT_GRAPH_STATUS_OK;
- break;
- case BT_GRAPH_STATUS_COMPONENT_REFUSES_PORT_CONNECTION:
- BT_LOGE("A component refused a connection to one of its ports: "
- "upstream-comp-addr=%p, upstream-comp-name=\"%s\", "
- "upstream-port-addr=%p, upstream-port-name=\"%s\", "
- "downstream-comp-addr=%p, downstream-comp-name=\"%s\", "
- "downstream-port-addr=%p, downstream-port-name=\"%s\", "
- "conn-arg=\"%s\"",
- upstream_comp, bt_component_get_name(upstream_comp),
- upstream_port, bt_port_get_name(upstream_port),
- downstream_comp, cfg_conn->downstream_comp_name->str,
- downstream_port, downstream_port_name,
- cfg_conn->arg->str);
- fprintf(stderr,
- "A component refused a connection to one of its ports (`%s` to `%s`): %s\n",
- bt_port_get_name(upstream_port),
- downstream_port_name,
- cfg_conn->arg->str);
break;
default:
- BT_LOGE("Cannot create connection: graph refuses to connect ports: "
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot create connection: graph refuses to connect ports: "
"upstream-comp-addr=%p, upstream-comp-name=\"%s\", "
"upstream-port-addr=%p, upstream-port-name=\"%s\", "
"downstream-comp-addr=%p, downstream-comp-name=\"%s\", "
downstream_comp, cfg_conn->downstream_comp_name->str,
downstream_port, downstream_port_name,
cfg_conn->arg->str);
- fprintf(stderr,
- "Cannot create connection: graph refuses to connect ports (`%s` to `%s`): %s\n",
- bt_port_get_name(upstream_port),
- downstream_port_name,
- cfg_conn->arg->str);
goto error;
}
}
/* No downstream port found */
- BT_LOGE("Cannot create connection: cannot find a matching downstream port for upstream port: "
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "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;
BT_ASSERT(upstream_port_name);
upstream_comp = bt_port_borrow_component_const(
bt_port_output_as_port_const(upstream_port));
- if (!upstream_comp) {
- BT_LOGW("Upstream port to connect is not part of a component: "
- "port-addr=%p, port-name=\"%s\"",
- upstream_port, upstream_port_name);
- ret = -1;
- goto end;
- }
-
+ BT_ASSERT(upstream_comp);
upstream_comp_name = bt_component_get_name(upstream_comp);
BT_ASSERT(upstream_comp_name);
BT_LOGI("Connecting upstream port: comp-addr=%p, comp-name=\"%s\", "
ret = cmd_run_ctx_connect_upstream_port_to_downstream_component(
ctx, upstream_comp, upstream_port, cfg_conn);
if (ret) {
- BT_LOGE("Cannot connect upstream port: "
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot connect upstream port: "
"port-addr=%p, port-name=\"%s\"",
upstream_port,
upstream_port_name);
- fprintf(stderr,
- "Cannot connect port `%s` of component `%s` to a downstream port: %s\n",
- upstream_port_name,
- upstream_comp_name,
- cfg_conn->arg->str);
goto error;
}
goto end;
}
- BT_LOGE("Cannot connect upstream port: port does not match any connection argument: "
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot connect upstream port: port does not match any connection argument: "
"port-addr=%p, port-name=\"%s\"", upstream_port,
upstream_port_name);
- fprintf(stderr,
- "Cannot create connection: upstream port `%s` does not match any connection\n",
- upstream_port_name);
error:
ret = -1;
}
static
-bt_graph_listener_status
+bt_graph_listener_func_status
graph_output_port_added_listener(struct cmd_run_ctx *ctx,
const bt_port_output *out_port)
{
const bt_component *comp;
const bt_port *port = bt_port_output_as_port_const(out_port);
- bt_graph_listener_status ret = BT_GRAPH_LISTENER_STATUS_OK;
+ bt_graph_listener_func_status ret =
+ BT_GRAPH_LISTENER_FUNC_STATUS_OK;
comp = bt_port_borrow_component_const(port);
BT_LOGI("Port added to a graph's component: comp-addr=%p, "
goto end;
}
- if (!comp) {
- BT_LOGW_STR("Port has no component.");
- goto end;
- }
+ BT_ASSERT(comp);
if (bt_port_is_connected(port)) {
BT_LOGW_STR("Port is already connected.");
}
if (cmd_run_ctx_connect_upstream_port(ctx, out_port)) {
- BT_LOGF_STR("Cannot connect upstream port.");
- fprintf(stderr, "Added port could not be connected: aborting\n");
- ret = BT_GRAPH_LISTENER_STATUS_ERROR;
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot connect upstream port.");
+ ret = BT_GRAPH_LISTENER_FUNC_STATUS_ERROR;
goto end;
}
}
static
-bt_graph_listener_status graph_source_output_port_added_listener(
+bt_graph_listener_func_status graph_source_output_port_added_listener(
const bt_component_source *component,
const bt_port_output *port, void *data)
{
}
static
-bt_graph_listener_status graph_filter_output_port_added_listener(
+bt_graph_listener_func_status graph_filter_output_port_added_listener(
const bt_component_filter *component,
const bt_port_output *port, void *data)
{
int cmd_run_ctx_init(struct cmd_run_ctx *ctx, struct bt_config *cfg)
{
int ret = 0;
- bt_graph_status status;
+ bt_graph_add_listener_status add_listener_status;
ctx->cfg = cfg;
ctx->connect_ports = false;
}
the_graph = ctx->graph;
- status = bt_graph_add_source_component_output_port_added_listener(
+ add_listener_status = bt_graph_add_source_component_output_port_added_listener(
ctx->graph, graph_source_output_port_added_listener, NULL, ctx,
NULL);
- if (status != BT_GRAPH_STATUS_OK) {
- BT_LOGE_STR("Cannot add \"port added\" listener to graph.");
+ if (add_listener_status != BT_GRAPH_ADD_LISTENER_STATUS_OK) {
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot add \"port added\" listener to graph.");
goto error;
}
- status = bt_graph_add_filter_component_output_port_added_listener(
+ add_listener_status = bt_graph_add_filter_component_output_port_added_listener(
ctx->graph, graph_filter_output_port_added_listener, NULL, ctx,
NULL);
- if (status != BT_GRAPH_STATUS_OK) {
- BT_LOGE_STR("Cannot add \"port added\" listener to graph.");
+ if (add_listener_status != BT_GRAPH_ADD_LISTENER_STATUS_OK) {
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot add \"port added\" listener to graph.");
goto error;
}
end = bt_value_signed_integer_get(intersection_end);
if (begin < 0 || end < 0 || end < begin) {
- BT_LOGW("Invalid trace stream intersection values: "
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Invalid trace stream intersection values: "
"intersection-range-ns:begin=%" PRId64
", intersection-range-ns:end=%" PRId64,
begin, end);
port_id = g_new0(struct port_id, 1);
if (!port_id) {
ret = -1;
- BT_LOGE_STR("Cannot allocate memory for port_id structure.");
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot allocate memory for port_id structure.");
goto error;
}
port_id->instance_name = strdup(cfg_comp->instance_name->str);
if (!port_id->instance_name) {
ret = -1;
- BT_LOGE_STR("Cannot allocate memory for port_id component instance name.");
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot allocate memory for port_id component instance name.");
goto error;
}
trace_range = g_new0(struct trace_range, 1);
if (!trace_range) {
ret = -1;
- BT_LOGE_STR("Cannot allocate memory for trace_range structure.");
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot allocate memory for trace_range structure.");
goto error;
}
trace_range->intersection_range_begin_ns = begin;
stream_infos, stream_idx);
if (!stream_info || !bt_value_is_map(stream_info)) {
ret = -1;
- BT_LOGE_STR("Cannot retrieve stream informations from trace in query result.");
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot retrieve stream informations from trace in query result.");
goto error;
}
port_name = bt_value_map_borrow_entry_value_const(stream_info, "port-name");
if (!port_name || !bt_value_is_string(port_name)) {
ret = -1;
- BT_LOGE_STR("Cannot retrieve port name in query result.");
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot retrieve port name in query result.");
goto error;
}
port_id->port_name = g_strdup(bt_value_string_get(port_name));
if (!port_id->port_name) {
ret = -1;
- BT_LOGE_STR("Cannot allocate memory for port_id port_name.");
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot allocate memory for port_id port_name.");
goto error;
}
goto end;
error:
- fprintf(stderr, "%s%sCannot determine stream intersection of trace at path \'%s\'.%s\n",
- bt_common_color_bold(),
- bt_common_color_fg_yellow(),
- path ? path : "(unknown)",
- bt_common_color_reset());
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot determine stream intersection of trace: path=\"%s\"",
+ path ? path : "(unknown)");
+
end:
bt_value_put_ref(query_result);
g_free(port_id);
}
if (!comp_cls) {
- BT_LOGE("Cannot find component class: plugin-name=\"%s\", "
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot find component class: plugin-name=\"%s\", "
"comp-cls-name=\"%s\", comp-cls-type=%d",
cfg_comp->plugin_name->str,
cfg_comp->comp_cls_name->str,
cfg_comp->type);
- fprintf(stderr, "%s%sCannot find component class %s",
- bt_common_color_bold(),
- bt_common_color_fg_red(),
- bt_common_color_reset());
- print_plugin_comp_cls_opt(stderr,
- cfg_comp->plugin_name->str,
- cfg_comp->comp_cls_name->str,
- cfg_comp->type);
- fprintf(stderr, "\n");
goto error;
}
}
if (ret) {
- BT_LOGE("Cannot create component: plugin-name=\"%s\", "
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot create component: plugin-name=\"%s\", "
"comp-cls-name=\"%s\", comp-cls-type=%d, "
"comp-name=\"%s\"",
cfg_comp->plugin_name->str,
cfg_comp->comp_cls_name->str,
cfg_comp->type, cfg_comp->instance_name->str);
- fprintf(stderr, "%s%sCannot create component `%s`%s\n",
- bt_common_color_bold(),
- bt_common_color_fg_red(),
- cfg_comp->instance_name->str,
- bt_common_color_reset());
goto error;
}
return ret;
}
-static inline
-const char *bt_graph_status_str(bt_graph_status status)
-{
- switch (status) {
- case BT_GRAPH_STATUS_OK:
- return "BT_GRAPH_STATUS_OK";
- case BT_GRAPH_STATUS_END:
- return "BT_GRAPH_STATUS_END";
- case BT_GRAPH_STATUS_AGAIN:
- return "BT_GRAPH_STATUS_AGAIN";
- case BT_GRAPH_STATUS_COMPONENT_REFUSES_PORT_CONNECTION:
- return "BT_GRAPH_STATUS_COMPONENT_REFUSES_PORT_CONNECTION";
- case BT_GRAPH_STATUS_CANCELED:
- return "BT_GRAPH_STATUS_CANCELED";
- case BT_GRAPH_STATUS_ERROR:
- return "BT_GRAPH_STATUS_ERROR";
- case BT_GRAPH_STATUS_NOMEM:
- return "BT_GRAPH_STATUS_NOMEM";
- default:
- return "(unknown)";
- }
-}
-
static
int cmd_run(struct bt_config *cfg)
{
/* Initialize the command's context and the graph object */
if (cmd_run_ctx_init(&ctx, cfg)) {
- BT_LOGE_STR("Cannot initialize the command's context.");
- fprintf(stderr, "Cannot initialize the command's context\n");
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot initialize the command's context.");
goto error;
}
/* Create the requested component instances */
if (cmd_run_ctx_create_components(&ctx)) {
- BT_LOGE_STR("Cannot create components.");
- fprintf(stderr, "Cannot create components\n");
+ BT_CLI_LOGE_APPEND_CAUSE("Cannot create components.");
goto error;
}
/* Connect the initially visible component ports */
if (cmd_run_ctx_connect_ports(&ctx)) {
- BT_LOGE_STR("Cannot connect initial component ports.");
- fprintf(stderr, "Cannot connect initial component ports\n");
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Cannot connect initial component ports.");
goto error;
}
/* Run the graph */
while (true) {
- bt_graph_status graph_status = bt_graph_run(ctx.graph);
+ bt_graph_run_status run_status = bt_graph_run(ctx.graph);
/*
* Reset console in case something messed with console
fflush(stdout);
fprintf(stderr, "%s", bt_common_color_reset());
BT_LOGT("bt_graph_run() returned: status=%s",
- bt_graph_status_str(graph_status));
+ bt_common_func_status_string(run_status));
- switch (graph_status) {
- case BT_GRAPH_STATUS_OK:
+ switch (run_status) {
+ case BT_GRAPH_RUN_STATUS_OK:
break;
- case BT_GRAPH_STATUS_CANCELED:
+ case BT_GRAPH_RUN_STATUS_CANCELED:
BT_LOGI_STR("Graph was canceled by user.");
goto error;
- case BT_GRAPH_STATUS_AGAIN:
+ case BT_GRAPH_RUN_STATUS_AGAIN:
if (bt_graph_is_canceled(ctx.graph)) {
BT_LOGI_STR("Graph was canceled by user.");
goto error;
}
if (cfg->cmd_data.run.retry_duration_us > 0) {
- BT_LOGT("Got BT_GRAPH_STATUS_AGAIN: sleeping: "
+ BT_LOGT("Got BT_GRAPH_RUN_STATUS_AGAIN: sleeping: "
"time-us=%" PRIu64,
cfg->cmd_data.run.retry_duration_us);
}
}
break;
- case BT_GRAPH_STATUS_END:
+ case BT_GRAPH_RUN_STATUS_END:
goto end;
default:
- BT_LOGE_STR("Graph failed to complete successfully");
- fprintf(stderr, "Graph failed to complete successfully\n");
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Graph failed to complete successfully");
goto error;
}
}
if (g_file_test(cfg->command_name,
G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
- fprintf(stderr, "\nNOTE: The `%s` command was executed. If you meant to convert a\n",
- cfg->command_name);
- fprintf(stderr, "trace located in the local `%s` directory, please use:\n",
- cfg->command_name);
- fprintf(stderr, "\n");
- fprintf(stderr, " babeltrace2 convert %s [OPTIONS]\n",
- cfg->command_name);
+ _bt_log_write_d(_BT_LOG_SRCLOC_FUNCTION, __FILE__, __LINE__,
+ BT_LOG_WARN, BT_LOG_TAG,
+ "The `%s` command was executed. "
+ "If you meant to convert a trace located in "
+ "the local `%s` directory, please use:\n\n"
+ " babeltrace2 convert %s [OPTIONS]",
+ cfg->command_name, cfg->command_name,
+ cfg->command_name);
}
}
}
if (retcode > 0) {
- BT_LOGE("Command-line error: retcode=%d", retcode);
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Command-line error: retcode=%d", retcode);
goto end;
}
if (!cfg) {
- BT_LOGE_STR("Failed to create a valid Babeltrace configuration.");
- fprintf(stderr, "Failed to create Babeltrace configuration\n");
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Failed to create a valid Babeltrace configuration.");
retcode = 1;
goto end;
}
if (cfg->command_needs_plugins) {
ret = load_all_plugins(cfg->plugin_paths);
if (ret) {
- BT_LOGE("Failed to load plugins: ret=%d", ret);
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Failed to load plugins: ret=%d", ret);
retcode = 1;
goto end;
}
end:
BT_OBJECT_PUT_REF_AND_RESET(cfg);
fini_static_data();
+
+ /*
+ * Clear current thread's error in case there is one to avoid a
+ * memory leak.
+ */
+ bt_current_thread_clear_error();
return retcode;
}
projects / babeltrace.git / blobdiff