X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcli%2Fbabeltrace2.c;h=bf6c49d53ede25b6e81ef4a7d877b9dedc5aebe4;hb=6375b9429f8332f3eacc2ec795aa1924c73d9cc8;hp=c4b7c29fc1605bc67910bcbdb98608c9c872a309;hpb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;p=babeltrace.git diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c index c4b7c29f..bf6c49d5 100644 --- a/src/cli/babeltrace2.c +++ b/src/cli/babeltrace2.c @@ -28,6 +28,7 @@ #define ENV_BABELTRACE_WARN_COMMAND_NAME_DIRECTORY_CLASH "BABELTRACE_CLI_WARN_COMMAND_NAME_DIRECTORY_CLASH" #define NSEC_PER_SEC 1000000000LL +#define EXIT_INTERRUPTED 2 enum bt_cmd_status { BT_CMD_STATUS_OK = 0, @@ -635,10 +636,11 @@ enum bt_cmd_status cmd_query(struct bt_config *cfg) if (!comp_cls) { BT_CLI_LOGE_APPEND_CAUSE( "Cannot find component class: plugin-name=\"%s\", " - "comp-cls-name=\"%s\", comp-cls-type=%d", + "comp-cls-name=\"%s\", comp-cls-type=%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); + bt_common_component_class_type_string( + cfg->cmd_data.query.cfg_component->type)); goto error; } @@ -648,11 +650,12 @@ enum bt_cmd_status cmd_query(struct bt_config *cfg) if (ret) { BT_CLI_LOGE_APPEND_CAUSE( "Failed to query component class: %s: plugin-name=\"%s\", " - "comp-cls-name=\"%s\", comp-cls-type=%d " + "comp-cls-name=\"%s\", comp-cls-type=%s " "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, + bt_common_component_class_type_string( + cfg->cmd_data.query.cfg_component->type), cfg->cmd_data.query.object->str); goto error; } @@ -742,10 +745,11 @@ enum bt_cmd_status cmd_help(struct bt_config *cfg) if (!needed_comp_cls) { BT_CLI_LOGE_APPEND_CAUSE( "Cannot find component class: plugin-name=\"%s\", " - "comp-cls-name=\"%s\", comp-cls-type=%d", + "comp-cls-name=\"%s\", comp-cls-type=%s", 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); + bt_common_component_class_type_string( + cfg->cmd_data.help.cfg_component->type)); goto error; } @@ -903,9 +907,10 @@ enum bt_cmd_status cmd_print_lttng_live_sessions(struct bt_config *cfg) if (!comp_cls) { BT_CLI_LOGE_APPEND_CAUSE( "Cannot find component class: plugin-name=\"%s\", " - "comp-cls-name=\"%s\", comp-cls-type=%d", + "comp-cls-name=\"%s\", comp-cls-type=%s", plugin_name, comp_cls_name, - BT_COMPONENT_CLASS_TYPE_SOURCE); + bt_common_component_class_type_string( + BT_COMPONENT_CLASS_TYPE_SOURCE)); goto error; } @@ -1042,9 +1047,10 @@ enum bt_cmd_status cmd_print_ctf_metadata(struct bt_config *cfg) if (!comp_cls) { BT_CLI_LOGE_APPEND_CAUSE( "Cannot find component class: plugin-name=\"%s\", " - "comp-cls-name=\"%s\", comp-cls-type=%d", + "comp-cls-name=\"%s\", comp-cls-type=%s", plugin_name, comp_cls_name, - BT_COMPONENT_CLASS_TYPE_SOURCE); + bt_common_component_class_type_string( + BT_COMPONENT_CLASS_TYPE_SOURCE)); goto error; } @@ -1701,8 +1707,9 @@ int add_descriptor_to_component_descriptor_set( if (!comp_cls) { 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, comp_cls_type); + "comp-cls-name=\"%s\", comp-cls-type=%s", + plugin_name, comp_cls_name, + bt_common_component_class_type_string(comp_cls_type)); status = -1; goto end; } @@ -2238,10 +2245,10 @@ int cmd_run_ctx_create_components_from_config_components( if (!comp_cls) { BT_CLI_LOGE_APPEND_CAUSE( "Cannot find component class: plugin-name=\"%s\", " - "comp-cls-name=\"%s\", comp-cls-type=%d", + "comp-cls-name=\"%s\", comp-cls-type=%s", cfg_comp->plugin_name->str, cfg_comp->comp_cls_name->str, - cfg_comp->type); + bt_common_component_class_type_string(cfg_comp->type)); goto error; } @@ -2276,11 +2283,12 @@ int cmd_run_ctx_create_components_from_config_components( if (ret) { BT_CLI_LOGE_APPEND_CAUSE( "Cannot create component: plugin-name=\"%s\", " - "comp-cls-name=\"%s\", comp-cls-type=%d, " + "comp-cls-name=\"%s\", comp-cls-type=%s, " "comp-name=\"%s\"", cfg_comp->plugin_name->str, cfg_comp->comp_cls_name->str, - cfg_comp->type, cfg_comp->instance_name->str); + bt_common_component_class_type_string(cfg_comp->type), + cfg_comp->instance_name->str); goto error; } @@ -2614,7 +2622,8 @@ end: int main(int argc, const char **argv) { - int ret, retcode; + int retcode; + enum bt_config_cli_args_status cli_args_status; enum bt_cmd_status cmd_status; struct bt_config *cfg = NULL; @@ -2626,41 +2635,38 @@ int main(int argc, const char **argv) the_interrupter = bt_interrupter_create(); if (!the_interrupter) { BT_CLI_LOGE_APPEND_CAUSE("Failed to create an interrupter object."); - retcode = 1; + retcode = EXIT_FAILURE; goto end; } - cfg = bt_config_cli_args_create_with_default(argc, argv, &retcode, + cli_args_status = bt_config_cli_args_create_with_default(argc, argv, &cfg, the_interrupter); - - if (retcode < 0) { + if (cli_args_status == BT_CONFIG_CLI_ARGS_STATUS_INFO_ONLY) { /* Quit without errors; typically usage/version */ - retcode = 0; + retcode = EXIT_SUCCESS; BT_LOGI_STR("Quitting without errors."); goto end; } - if (retcode > 0) { + if (cli_args_status == BT_CONFIG_CLI_ARGS_STATUS_ERROR) { + retcode = EXIT_FAILURE; BT_CLI_LOGE_APPEND_CAUSE( "Command-line error: retcode=%d", retcode); goto end; } - if (!cfg) { - BT_CLI_LOGE_APPEND_CAUSE( - "Failed to create a valid Babeltrace CLI configuration."); - retcode = 1; - goto end; - } + BT_ASSERT(cli_args_status == BT_CONFIG_CLI_ARGS_STATUS_OK); + BT_ASSERT(cfg); print_cfg(cfg); if (cfg->command_needs_plugins) { - ret = require_loaded_plugins(cfg->plugin_paths); + int ret = require_loaded_plugins(cfg->plugin_paths); + if (ret) { BT_CLI_LOGE_APPEND_CAUSE( "Failed to load plugins: ret=%d", ret); - retcode = 1; + retcode = EXIT_FAILURE; goto end; } } @@ -2698,13 +2704,13 @@ int main(int argc, const char **argv) switch (cmd_status) { case BT_CMD_STATUS_OK: - retcode = 0; + retcode = EXIT_SUCCESS; break; case BT_CMD_STATUS_ERROR: - retcode = 1; + retcode = EXIT_FAILURE; break; case BT_CMD_STATUS_INTERRUPTED: - retcode = 2; + retcode = EXIT_INTERRUPTED; break; default: BT_LOGF("Invalid command status: cmd-status=%d", cmd_status); @@ -2712,7 +2718,7 @@ int main(int argc, const char **argv) } end: - if (retcode == 1) { + if (retcode == EXIT_FAILURE) { print_error_causes(); }