/*
- * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
- *
- * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
*
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
*/
#define BT_LOG_TAG "CLI"
#include <babeltrace2/babeltrace.h>
#include "common/common.h"
+#include "string-format/format-error.h"
+#include "string-format/format-plugin-comp-cls-name.h"
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#define ENV_BABELTRACE_WARN_COMMAND_NAME_DIRECTORY_CLASH "BABELTRACE_CLI_WARN_COMMAND_NAME_DIRECTORY_CLASH"
#define NSEC_PER_SEC 1000000000LL
+enum bt_cmd_status {
+ BT_CMD_STATUS_OK = 0,
+ BT_CMD_STATUS_ERROR = -1,
+ BT_CMD_STATUS_INTERRUPTED = -2,
+};
+
+static
+const char *bt_cmd_status_string(enum bt_cmd_status cmd_status)
+{
+ switch (cmd_status) {
+ case BT_CMD_STATUS_OK:
+ return "OK";
+ case BT_CMD_STATUS_ERROR:
+ return "ERROR";
+ case BT_CMD_STATUS_INTERRUPTED:
+ return "INTERRUPTED";
+ default:
+ bt_common_abort();
+ }
+}
+
/* Application's interrupter (owned by this) */
static bt_interrupter *the_interrupter;
BT_LOGI("Finding component class: plugin-name=\"%s\", "
"comp-cls-name=\"%s\"", plugin_name, comp_class_name);
- plugin = find_loaded_plugin(plugin_name);
+ plugin = borrow_loaded_plugin_by_name(plugin_name);
if (!plugin) {
goto end;
}
comp_class = plugin_borrow_comp_cls_func(plugin, comp_class_name);
bt_object_get_ref(comp_class);
- BT_PLUGIN_PUT_REF_AND_RESET(plugin);
end:
if (comp_class) {
comp_cls = bt_component_class_sink_as_component_class_const(find_sink_component_class(plugin_name, comp_class_name));
break;
default:
- abort();
+ bt_common_abort();
}
return comp_cls;
}
}
-static
-const char *component_type_str(bt_component_class_type type)
-{
- switch (type) {
- case BT_COMPONENT_CLASS_TYPE_SOURCE:
- return "source";
- case BT_COMPONENT_CLASS_TYPE_SINK:
- return "sink";
- case BT_COMPONENT_CLASS_TYPE_FILTER:
- return "filter";
- default:
- return "(unknown)";
- }
-}
-
-static
-void print_plugin_comp_cls_opt(FILE *fh, const char *plugin_name,
- const char *comp_cls_name, bt_component_class_type type)
-{
- GString *shell_plugin_name = NULL;
- GString *shell_comp_cls_name = NULL;
-
- if (plugin_name) {
- shell_plugin_name = bt_common_shell_quote(plugin_name, false);
- if (!shell_plugin_name) {
- goto end;
- }
- }
-
- shell_comp_cls_name = bt_common_shell_quote(comp_cls_name, false);
- if (!shell_comp_cls_name) {
- goto end;
- }
-
- fprintf(fh, "'%s%s%s%s",
- bt_common_color_bold(),
- bt_common_color_fg_cyan(),
- component_type_str(type),
- bt_common_color_fg_default());
-
- if (shell_plugin_name) {
- fprintf(fh, ".%s%s%s",
- bt_common_color_fg_blue(),
- shell_plugin_name->str,
- bt_common_color_fg_default());
- }
-
- fprintf(fh, ".%s%s%s'",
- bt_common_color_fg_yellow(),
- shell_comp_cls_name->str,
- bt_common_color_reset());
-
-end:
- if (shell_plugin_name) {
- g_string_free(shell_plugin_name, TRUE);
- }
-
- if (shell_comp_cls_name) {
- g_string_free(shell_comp_cls_name, TRUE);
- }
-}
-
static
void print_value(FILE *, const bt_value *, size_t);
}
static
-bt_bool collect_map_keys(const char *key, const bt_value *object, void *data)
+bt_value_map_foreach_entry_const_func_status collect_map_keys(
+ const char *key, const bt_value *object, void *data)
{
GPtrArray *map_keys = data;
g_ptr_array_add(map_keys, (gpointer *) key);
- return BT_TRUE;
+ return BT_VALUE_MAP_FOREACH_ENTRY_CONST_FUNC_STATUS_OK;
}
static
case BT_VALUE_TYPE_BOOL:
bool_val = bt_value_bool_get(value);
fprintf(fp, "%s%s%s%s\n", bt_common_color_bold(),
- bt_common_color_fg_cyan(), bool_val ? "yes" : "no",
+ bt_common_color_fg_bright_cyan(), bool_val ? "yes" : "no",
bt_common_color_reset());
break;
case BT_VALUE_TYPE_UNSIGNED_INTEGER:
uint_val = bt_value_integer_unsigned_get(value);
fprintf(fp, "%s%s%" PRIu64 "%s\n", bt_common_color_bold(),
- bt_common_color_fg_red(), uint_val,
+ bt_common_color_fg_bright_red(), uint_val,
bt_common_color_reset());
break;
case BT_VALUE_TYPE_SIGNED_INTEGER:
int_val = bt_value_integer_signed_get(value);
fprintf(fp, "%s%s%" PRId64 "%s\n", bt_common_color_bold(),
- bt_common_color_fg_red(), int_val,
+ bt_common_color_fg_bright_red(), int_val,
bt_common_color_reset());
break;
case BT_VALUE_TYPE_REAL:
dbl_val = bt_value_real_get(value);
fprintf(fp, "%s%s%lf%s\n", bt_common_color_bold(),
- bt_common_color_fg_red(), dbl_val,
+ bt_common_color_fg_bright_red(), dbl_val,
bt_common_color_reset());
break;
case BT_VALUE_TYPE_STRING:
str_val = bt_value_string_get(value);
fprintf(fp, "%s%s%s%s\n", bt_common_color_bold(),
- bt_common_color_fg_green(), str_val,
+ bt_common_color_fg_bright_green(), str_val,
bt_common_color_reset());
break;
case BT_VALUE_TYPE_ARRAY:
break;
}
default:
- abort();
+ bt_common_abort();
}
goto end;
static
void print_bt_config_component(struct bt_config_component *bt_config_component)
{
- fprintf(stderr, " ");
- print_plugin_comp_cls_opt(stderr, bt_config_component->plugin_name->str,
+ gchar *comp_cls_str;
+
+ comp_cls_str = format_plugin_comp_cls_opt(
+ bt_config_component->plugin_name->str,
bt_config_component->comp_cls_name->str,
- bt_config_component->type);
- fprintf(stderr, ":\n");
+ bt_config_component->type,
+ BT_COMMON_COLOR_WHEN_AUTO);
+ BT_ASSERT(comp_cls_str);
+
+ fprintf(stderr, " %s:\n", comp_cls_str);
if (bt_config_component->instance_name->len > 0) {
fprintf(stderr, " Name: %s\n",
fprintf(stderr, " Parameters:\n");
print_value(stderr, bt_config_component->params, 8);
+
+ g_free(comp_cls_str);
}
static
print_cfg_print_lttng_live_sessions(cfg);
break;
default:
- abort();
+ bt_common_abort();
}
}
version_avail = bt_plugin_get_version(plugin, &major, &minor,
&patch, &extra);
printf("%s%s%s%s:\n", bt_common_color_bold(),
- bt_common_color_fg_blue(), plugin_name,
+ bt_common_color_fg_bright_blue(), plugin_name,
bt_common_color_reset());
if (path) {
printf(" %sPath%s: %s\n", bt_common_color_bold(),
}
static
-int cmd_query(struct bt_config *cfg)
+enum bt_cmd_status cmd_query(struct bt_config *cfg)
{
int ret = 0;
+ enum bt_cmd_status cmd_status;
const bt_component_class *comp_cls = NULL;
const bt_value *results = NULL;
const char *fail_reason = NULL;
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);
- ret = -1;
- goto end;
+ goto error;
}
ret = query(cfg, comp_cls, cfg->cmd_data.query.object->str,
cfg->cmd_data.query.cfg_component->params,
&results, &fail_reason);
if (ret) {
- goto failed;
+ 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);
+ goto error;
}
print_value(stdout, results, 0);
+ cmd_status = BT_CMD_STATUS_OK;
goto end;
-failed:
- 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);
- ret = -1;
+error:
+ cmd_status = BT_CMD_STATUS_ERROR;
end:
bt_component_class_put_ref(comp_cls);
bt_value_put_ref(results);
- return ret;
+ return cmd_status;
}
static
bt_component_class_get_help(comp_cls);
bt_component_class_type type =
bt_component_class_get_type(comp_cls);
+ gchar *comp_cls_str;
- print_plugin_comp_cls_opt(stdout, plugin_name, comp_class_name, type);
- printf("\n");
+ comp_cls_str = format_plugin_comp_cls_opt(plugin_name, comp_class_name,
+ type, BT_COMMON_COLOR_WHEN_AUTO);
+ BT_ASSERT(comp_cls_str);
+
+ printf("%s\n", comp_cls_str);
printf(" %sDescription%s: %s\n", bt_common_color_bold(),
bt_common_color_reset(),
comp_class_description ? comp_class_description : "(None)");
if (comp_class_help) {
printf("\n%s\n", comp_class_help);
}
+
+ g_free(comp_cls_str);
}
static
-int cmd_help(struct bt_config *cfg)
+enum bt_cmd_status cmd_help(struct bt_config *cfg)
{
- int ret = 0;
+ enum bt_cmd_status cmd_status;
const bt_plugin *plugin = NULL;
const bt_component_class *needed_comp_cls = NULL;
- plugin = find_loaded_plugin(cfg->cmd_data.help.cfg_component->plugin_name->str);
+ plugin = borrow_loaded_plugin_by_name(cfg->cmd_data.help.cfg_component->plugin_name->str);
if (!plugin) {
BT_CLI_LOGE_APPEND_CAUSE(
"Cannot find plugin: plugin-name=\"%s\"",
cfg->cmd_data.help.cfg_component->plugin_name->str);
- ret = -1;
- goto end;
+ goto error;
}
print_plugin_info(plugin);
if (strlen(cfg->cmd_data.help.cfg_component->comp_cls_name->str) == 0) {
/* Plugin help only */
+ cmd_status = BT_CMD_STATUS_OK;
goto end;
}
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);
- ret = -1;
- goto end;
+ goto error;
}
printf("\n");
print_component_class_help(
cfg->cmd_data.help.cfg_component->plugin_name->str,
needed_comp_cls);
+ cmd_status = BT_CMD_STATUS_OK;
+ goto end;
+
+error:
+ cmd_status = BT_CMD_STATUS_ERROR;
end:
bt_component_class_put_ref(needed_comp_cls);
- bt_plugin_put_ref(plugin);
- return ret;
+ return cmd_status;
}
typedef void *(* plugin_borrow_comp_cls_by_index_func_t)(const bt_plugin *,
spec_comp_cls_borrow_comp_cls_func_t spec_comp_cls_borrow_comp_cls_func)
{
uint64_t i;
+ gchar *comp_cls_str = NULL;
if (count == 0) {
printf(" %s%s component classes%s: (none)\n",
bt_component_class_type type =
bt_component_class_get_type(comp_class);
- printf(" ");
- print_plugin_comp_cls_opt(stdout,
- bt_plugin_get_name(plugin), comp_class_name,
- type);
+ g_free(comp_cls_str);
+ comp_cls_str = format_plugin_comp_cls_opt(
+ bt_plugin_get_name(plugin), comp_class_name, type,
+ BT_COMMON_COLOR_WHEN_AUTO);
+ printf(" %s", comp_cls_str);
if (comp_class_description) {
printf(": %s", comp_class_description);
}
end:
- return;
+ g_free(comp_cls_str);
}
static
-int cmd_list_plugins(struct bt_config *cfg)
+enum bt_cmd_status cmd_list_plugins(struct bt_config *cfg)
{
- int ret = 0;
int plugins_count, component_classes_count = 0, i;
printf("From the following plugin paths:\n\n");
}
for (i = 0; i < plugins_count; i++) {
- const bt_plugin *plugin = borrow_loaded_plugin(i);
+ const bt_plugin *plugin = borrow_loaded_plugin_by_index(i);
component_classes_count +=
bt_plugin_get_source_component_class_count(plugin) +
bt_common_color_reset());
for (i = 0; i < plugins_count; i++) {
- const bt_plugin *plugin = borrow_loaded_plugin(i);
+ const bt_plugin *plugin = borrow_loaded_plugin_by_index(i);
printf("\n");
print_plugin_info(plugin);
}
end:
- return ret;
+ return BT_CMD_STATUS_OK;
}
static
-int cmd_print_lttng_live_sessions(struct bt_config *cfg)
+enum bt_cmd_status cmd_print_lttng_live_sessions(struct bt_config *cfg)
{
int ret = 0;
+ enum bt_cmd_status cmd_status;
const bt_component_class *comp_cls = NULL;
const bt_value *results = NULL;
bt_value *params = NULL;
ret = query(cfg, comp_cls, "sessions", params,
&results, &fail_reason);
if (ret) {
- goto failed;
+ BT_CLI_LOGE_APPEND_CAUSE("Failed to query `sessions` object: %s",
+ fail_reason);
+ goto error;
}
BT_ASSERT(results);
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);
"Babeltrace CLI",
"Cannot open file for writing: path=\"%s\"",
cfg->cmd_data.print_lttng_live_sessions.output_path->str);
- goto end;
+ goto error;
}
}
fprintf(out_stream, "%" PRIu64 " client(s) connected)\n", clients);
}
+ cmd_status = BT_CMD_STATUS_OK;
goto end;
-failed:
- BT_CLI_LOGE_APPEND_CAUSE("Failed to query `sessions` object: %s",
- fail_reason);
-
error:
- ret = -1;
+ cmd_status = BT_CMD_STATUS_ERROR;
end:
bt_value_put_ref(results);
}
}
- return ret;
+ return cmd_status;
}
static
-int cmd_print_ctf_metadata(struct bt_config *cfg)
+enum bt_cmd_status cmd_print_ctf_metadata(struct bt_config *cfg)
{
int ret = 0;
+ enum bt_cmd_status cmd_status;
const bt_component_class *comp_cls = NULL;
const bt_value *results = NULL;
bt_value *params = NULL;
"comp-cls-name=\"%s\", comp-cls-type=%d",
plugin_name, comp_cls_name,
BT_COMPONENT_CLASS_TYPE_SOURCE);
- ret = -1;
- goto end;
+ goto error;
}
params = bt_value_map_create();
if (!params) {
- ret = -1;
- goto end;
+ goto error;
}
ret = bt_value_map_insert_string_entry(params, "path",
cfg->cmd_data.print_ctf_metadata.path->str);
if (ret) {
- ret = -1;
- goto end;
+ goto error;
}
ret = query(cfg, comp_cls, "metadata-info",
params, &results, &fail_reason);
if (ret) {
- goto failed;
+ BT_CLI_LOGE_APPEND_CAUSE(
+ "Failed to query `metadata-info` object: %s", fail_reason);
+ goto error;
}
metadata_text_value = bt_value_map_borrow_entry_value_const(results,
if (!metadata_text_value) {
BT_CLI_LOGE_APPEND_CAUSE(
"Cannot find `text` string value in the resulting metadata info object.");
- ret = -1;
- goto end;
+ goto error;
}
metadata_text = bt_value_string_get(metadata_text_value);
"Babeltrace CLI",
"Cannot open file for writing: path=\"%s\"",
cfg->cmd_data.print_ctf_metadata.output_path->str);
- ret = -1;
- goto end;
+ goto error;
}
}
BT_CLI_LOGE_APPEND_CAUSE(
"Cannot write whole metadata text to output stream: "
"ret=%d", ret);
- goto end;
+ goto error;
}
- ret = 0;
+ cmd_status = BT_CMD_STATUS_OK;
goto end;
-failed:
- ret = -1;
- BT_CLI_LOGE_APPEND_CAUSE(
- "Failed to query `metadata-info` object: %s", fail_reason);
+error:
+ cmd_status = BT_CMD_STATUS_ERROR;
end:
bt_value_put_ref(results);
}
}
- return ret;
+ return cmd_status;
}
struct port_id {
ctx->graph, trimmer_class, trimmer_name,
trimmer_params, ctx->cfg->log_level,
&trimmer);
+ bt_component_filter_get_ref(trimmer);
free(trimmer_name);
if (add_comp_status !=
BT_GRAPH_ADD_COMPONENT_STATUS_OK) {
bt_graph_add_interrupter(ctx->graph, the_interrupter);
add_listener_status = bt_graph_add_source_component_output_port_added_listener(
- ctx->graph, graph_source_output_port_added_listener, NULL, ctx,
+ ctx->graph, graph_source_output_port_added_listener, ctx,
NULL);
if (add_listener_status != BT_GRAPH_ADD_LISTENER_STATUS_OK) {
BT_CLI_LOGE_APPEND_CAUSE(
}
add_listener_status = bt_graph_add_filter_component_output_port_added_listener(
- ctx->graph, graph_filter_output_port_added_listener, NULL, ctx,
+ ctx->graph, graph_filter_output_port_added_listener, ctx,
NULL);
if (add_listener_status != BT_GRAPH_ADD_LISTENER_STATUS_OK) {
BT_CLI_LOGE_APPEND_CAUSE(
cfg_comp->comp_cls_name->str);
break;
default:
- abort();
+ bt_common_abort();
}
if (!comp_cls) {
comp_cls, cfg_comp->instance_name->str,
cfg_comp->params, cfg_comp->log_level,
(void *) &comp);
+ bt_component_source_get_ref(comp);
break;
case BT_COMPONENT_CLASS_TYPE_FILTER:
ret = bt_graph_add_filter_component(ctx->graph,
comp_cls, cfg_comp->instance_name->str,
cfg_comp->params, cfg_comp->log_level,
(void *) &comp);
+ bt_component_filter_get_ref(comp);
break;
case BT_COMPONENT_CLASS_TYPE_SINK:
ret = bt_graph_add_sink_component(ctx->graph,
comp_cls, cfg_comp->instance_name->str,
cfg_comp->params, cfg_comp->log_level,
(void *) &comp);
+ bt_component_sink_get_ref(comp);
break;
default:
- abort();
+ bt_common_abort();
}
if (ret) {
GUINT_TO_POINTER(quark), (void *) comp);
break;
default:
- abort();
+ bt_common_abort();
}
comp = NULL;
}
static
-int cmd_run(struct bt_config *cfg)
+enum bt_cmd_status cmd_run(struct bt_config *cfg)
{
- int ret = 0;
+ enum bt_cmd_status cmd_status;
struct cmd_run_ctx ctx = { 0 };
/* Initialize the command's context and the graph object */
switch (run_status) {
case BT_GRAPH_RUN_STATUS_OK:
+ cmd_status = BT_CMD_STATUS_OK;
goto end;
case BT_GRAPH_RUN_STATUS_AGAIN:
if (bt_interrupter_is_set(the_interrupter)) {
- BT_CLI_LOGW_APPEND_CAUSE(
- "Graph was interrupted by user.");
- goto error;
+ /*
+ * The graph was interrupted by a SIGINT.
+ */
+ cmd_status = BT_CMD_STATUS_INTERRUPTED;
+ goto end;
}
if (cfg->cmd_data.run.retry_duration_us > 0) {
if (usleep(cfg->cmd_data.run.retry_duration_us)) {
if (bt_interrupter_is_set(the_interrupter)) {
- BT_CLI_LOGW_APPEND_CAUSE(
- "Graph was interrupted by user.");
- goto error;
+ cmd_status = BT_CMD_STATUS_INTERRUPTED;
+ goto end;
}
}
}
break;
default:
if (bt_interrupter_is_set(the_interrupter)) {
- BT_CLI_LOGW_APPEND_CAUSE(
- "Graph was interrupted by user and failed: "
- "status=%s",
- bt_common_func_status_string(run_status));
- goto error;
+ cmd_status = BT_CMD_STATUS_INTERRUPTED;
+ goto end;
}
BT_CLI_LOGE_APPEND_CAUSE(
goto error;
}
}
-
- goto end;
-
error:
- if (ret == 0) {
- ret = -1;
- }
+ cmd_status = BT_CMD_STATUS_ERROR;
end:
cmd_run_ctx_destroy(&ctx);
- return ret;
+ return cmd_status;
}
static
void print_error_causes(void)
{
const bt_error *error = bt_current_thread_take_error();
- int64_t i;
- GString *folded = NULL;
unsigned int columns;
+ gchar *error_str = NULL;
if (!error || bt_error_get_cause_count(error) == 0) {
fprintf(stderr, "%s%sUnknown command-line error.%s\n",
- bt_common_color_bold(), bt_common_color_fg_red(),
+ bt_common_color_bold(), bt_common_color_fg_bright_red(),
bt_common_color_reset());
goto end;
}
* This helps visually separate the error causes from the last
* logging statement.
*/
- fprintf(stderr, "\n");
-
- /* Reverse order: deepest (root) cause printed at the end */
- for (i = bt_error_get_cause_count(error) - 1; i >= 0; i--) {
- const bt_error_cause *cause =
- bt_error_borrow_cause_by_index(error, (uint64_t) i);
- const char *prefix_fmt =
- i == bt_error_get_cause_count(error) - 1 ?
- "%s%sERROR%s: " : "%s%sCAUSED BY%s ";
-
- /* Print prefix */
- fprintf(stderr, prefix_fmt,
- bt_common_color_bold(), bt_common_color_fg_red(),
- bt_common_color_reset());
+ fputc('\n', stderr);
- /* Print actor name */
- fprintf(stderr, "[");
- switch (bt_error_cause_get_actor_type(cause)) {
- case BT_ERROR_CAUSE_ACTOR_TYPE_UNKNOWN:
- fprintf(stderr, "%s%s%s",
- bt_common_color_bold(),
- bt_error_cause_get_module_name(cause),
- bt_common_color_reset());
- break;
- case BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT:
- fprintf(stderr, "%s%s%s: ",
- bt_common_color_bold(),
- bt_error_cause_component_actor_get_component_name(cause),
- bt_common_color_reset());
- print_plugin_comp_cls_opt(stderr,
- bt_error_cause_component_actor_get_plugin_name(cause),
- bt_error_cause_component_actor_get_component_class_name(cause),
- bt_error_cause_component_actor_get_component_class_type(cause));
- break;
- case BT_ERROR_CAUSE_ACTOR_TYPE_COMPONENT_CLASS:
- print_plugin_comp_cls_opt(stderr,
- bt_error_cause_component_class_actor_get_plugin_name(cause),
- bt_error_cause_component_class_actor_get_component_class_name(cause),
- bt_error_cause_component_class_actor_get_component_class_type(cause));
- break;
- case BT_ERROR_CAUSE_ACTOR_TYPE_MESSAGE_ITERATOR:
- fprintf(stderr, "%s%s%s (%s%s%s): ",
- bt_common_color_bold(),
- bt_error_cause_message_iterator_actor_get_component_name(cause),
- bt_common_color_reset(),
- bt_common_color_bold(),
- bt_error_cause_message_iterator_actor_get_component_output_port_name(cause),
- bt_common_color_reset());
- print_plugin_comp_cls_opt(stderr,
- bt_error_cause_message_iterator_actor_get_plugin_name(cause),
- bt_error_cause_message_iterator_actor_get_component_class_name(cause),
- bt_error_cause_message_iterator_actor_get_component_class_type(cause));
- break;
- default:
- abort();
- }
+ error_str = format_bt_error(error, columns, bt_cli_log_level,
+ BT_COMMON_COLOR_WHEN_AUTO);
+ BT_ASSERT(error_str);
- /* Print file name and line number */
- fprintf(stderr, "] (%s%s%s%s:%s%" PRIu64 "%s)\n",
- bt_common_color_bold(),
- bt_common_color_fg_magenta(),
- bt_error_cause_get_file_name(cause),
- bt_common_color_reset(),
- bt_common_color_fg_green(),
- bt_error_cause_get_line_number(cause),
- bt_common_color_reset());
-
- /* Print message */
- folded = bt_common_fold(bt_error_cause_get_message(cause),
- columns, 2);
- if (!folded) {
- BT_LOGE_STR("Could not fold string.");
- fprintf(stderr, "%s\n",
- bt_error_cause_get_message(cause));
- continue;
- }
-
- fprintf(stderr, "%s\n", folded->str);
- g_string_free(folded, TRUE);
- folded = NULL;
- }
+ fprintf(stderr, "%s\n", error_str);
end:
- BT_ASSERT(!folded);
-
if (error) {
bt_error_release(error);
}
+
+ g_free(error_str);
}
int main(int argc, const char **argv)
{
- int ret;
- int retcode;
+ int ret, retcode;
+ enum bt_cmd_status cmd_status;
struct bt_config *cfg = NULL;
init_log_level();
switch (cfg->command) {
case BT_CONFIG_COMMAND_RUN:
- ret = cmd_run(cfg);
+ cmd_status = cmd_run(cfg);
break;
case BT_CONFIG_COMMAND_LIST_PLUGINS:
- ret = cmd_list_plugins(cfg);
+ cmd_status = cmd_list_plugins(cfg);
break;
case BT_CONFIG_COMMAND_HELP:
- ret = cmd_help(cfg);
+ cmd_status = cmd_help(cfg);
break;
case BT_CONFIG_COMMAND_QUERY:
- ret = cmd_query(cfg);
+ cmd_status = cmd_query(cfg);
break;
case BT_CONFIG_COMMAND_PRINT_CTF_METADATA:
- ret = cmd_print_ctf_metadata(cfg);
+ cmd_status = cmd_print_ctf_metadata(cfg);
break;
case BT_CONFIG_COMMAND_PRINT_LTTNG_LIVE_SESSIONS:
- ret = cmd_print_lttng_live_sessions(cfg);
+ cmd_status = cmd_print_lttng_live_sessions(cfg);
break;
default:
BT_LOGF("Invalid/unknown command: cmd=%d", cfg->command);
- abort();
+ bt_common_abort();
}
- BT_LOGI("Command completed: cmd=%d, command-name=\"%s\", ret=%d",
- cfg->command, cfg->command_name, ret);
+ BT_LOGI("Command completed: cmd=%d, command-name=\"%s\", command-status=\"%s\"",
+ cfg->command, cfg->command_name, bt_cmd_status_string(cmd_status));
warn_command_name_and_directory_clash(cfg);
- retcode = ret ? 1 : 0;
+
+ switch (cmd_status) {
+ case BT_CMD_STATUS_OK:
+ retcode = 0;
+ break;
+ case BT_CMD_STATUS_ERROR:
+ retcode = 1;
+ break;
+ case BT_CMD_STATUS_INTERRUPTED:
+ retcode = 2;
+ break;
+ default:
+ BT_LOGF("Invalid command status: cmd-status=%d", cmd_status);
+ bt_common_abort();
+ }
end:
+ if (retcode == 1) {
+ print_error_causes();
+ }
+
BT_OBJECT_PUT_REF_AND_RESET(cfg);
fini_loaded_plugins();
bt_interrupter_put_ref(the_interrupter);
- if (retcode != 0) {
- print_error_causes();
- }
-
/*
* Clear current thread's error in case there is one to avoid a
* memory leak.
projects / babeltrace.git / blobdiff