X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcli%2Fbabeltrace2.c;h=ad211fa24f2b47e2d4d794a8b7d60f26f45c5442;hb=96c1b5feba1f2193b87bab6c29ba47a1b5edd0b5;hp=7dfeedbdb3091252d8c447d312e3e40abe0acb1b;hpb=27c61ce8f6ee66d910507f8a40ae5497287c943e;p=babeltrace.git diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c index 7dfeedbd..ad211fa2 100644 --- a/src/cli/babeltrace2.c +++ b/src/cli/babeltrace2.c @@ -27,6 +27,8 @@ #include #include "common/common.h" +#include "string-format/format-error.h" +#include "string-format/format-plugin-comp-cls-name.h" #include #include #include @@ -230,68 +232,6 @@ void print_indent(FILE *fp, size_t indent) } } -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_bright_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); @@ -502,11 +442,16 @@ void print_value(FILE *fp, const bt_value *value, size_t indent) 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", @@ -515,6 +460,8 @@ void print_bt_config_component(struct bt_config_component *bt_config_component) fprintf(stderr, " Parameters:\n"); print_value(stderr, bt_config_component->params, 8); + + g_free(comp_cls_str); } static @@ -754,9 +701,13 @@ void print_component_class_help(const char *plugin_name, 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)"); @@ -764,6 +715,8 @@ void print_component_class_help(const char *plugin_name, if (comp_class_help) { printf("\n%s\n", comp_class_help); } + + g_free(comp_cls_str); } static @@ -843,6 +796,7 @@ void cmd_list_plugins_print_component_classes(const bt_plugin *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", @@ -868,10 +822,11 @@ void cmd_list_plugins_print_component_classes(const bt_plugin *plugin, 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); @@ -881,7 +836,7 @@ void cmd_list_plugins_print_component_classes(const bt_plugin *plugin, } end: - return; + g_free(comp_cls_str); } static @@ -2637,9 +2592,8 @@ 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", @@ -2658,94 +2612,20 @@ void print_error_causes(void) * 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_bright_red(), - bt_common_color_reset()); - - /* 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: - bt_common_abort(); - } + fputc('\n', stderr); - /* Print file name and line number */ - fprintf(stderr, "] (%s%s%s%s:%s%" PRIu64 "%s)\n", - bt_common_color_bold(), - bt_common_color_fg_bright_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()); + error_str = format_bt_error(error, columns, bt_cli_log_level, + BT_COMMON_COLOR_WHEN_AUTO); + BT_ASSERT(error_str); - /* 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) @@ -2838,7 +2718,6 @@ int main(int argc, const char **argv) break; case BT_CMD_STATUS_ERROR: retcode = 1; - print_error_causes(); break; case BT_CMD_STATUS_INTERRUPTED: retcode = 2; @@ -2849,6 +2728,10 @@ int main(int argc, const char **argv) } end: + if (retcode == 1) { + print_error_causes(); + } + BT_OBJECT_PUT_REF_AND_RESET(cfg); fini_loaded_plugins(); bt_interrupter_put_ref(the_interrupter);