X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2Fbabeltrace.c;h=03d6589124c4ca4ea0bd0909743c97fdc23a256d;hb=7cdc2bab17acd56d035b204518ef845fa5a9f1c7;hp=cb8492f2acfd9630f1b5d1feb8c8d5653ac2f075;hpb=8d77550c9ec0f0bdb483a672a676e842510bb384;p=babeltrace.git diff --git a/cli/babeltrace.c b/cli/babeltrace.c index cb8492f2..03d65891 100644 --- a/cli/babeltrace.c +++ b/cli/babeltrace.c @@ -40,26 +40,37 @@ #include #include #include +#include +#include #include #include #include #include #include #include +#include #include "babeltrace-cfg.h" -#include "babeltrace-cfg-connect.h" -#include "default-cfg.h" +#include "babeltrace-cfg-cli-args.h" +#include "babeltrace-cfg-cli-args-default.h" + +#define BT_LOG_TAG "CLI" +#include "logging.h" + +#define ENV_BABELTRACE_WARN_COMMAND_NAME_DIRECTORY_CLASH "BABELTRACE_CLI_WARN_COMMAND_NAME_DIRECTORY_CLASH" GPtrArray *loaded_plugins; +BT_HIDDEN +int bt_cli_log_level = BT_LOG_NONE; + static -void init_loaded_plugins_array(void) +void init_static_data(void) { - loaded_plugins = g_ptr_array_new_full(8, bt_put); + loaded_plugins = g_ptr_array_new_with_free_func(bt_put); } static -void fini_loaded_plugins_array(void) +void fini_static_data(void) { g_ptr_array_free(loaded_plugins, TRUE); } @@ -70,6 +81,9 @@ struct bt_plugin *find_plugin(const char *name) int i; struct bt_plugin *plugin = NULL; + assert(name); + BT_LOGD("Finding plugin: name=\"%s\"", name); + for (i = 0; i < loaded_plugins->len; i++) { plugin = g_ptr_array_index(loaded_plugins, i); @@ -80,6 +94,14 @@ struct bt_plugin *find_plugin(const char *name) plugin = NULL; } + if (BT_LOG_ON_DEBUG) { + if (plugin) { + BT_LOGD("Found plugin: plugin-addr=%p", plugin); + } else { + BT_LOGD("Cannot find plugin."); + } + } + return bt_get(plugin); } @@ -89,7 +111,13 @@ struct bt_component_class *find_component_class(const char *plugin_name, enum bt_component_class_type comp_class_type) { struct bt_component_class *comp_class = NULL; - struct bt_plugin *plugin = find_plugin(plugin_name); + struct bt_plugin *plugin; + + BT_LOGD("Finding component class: plugin-name=\"%s\", " + "comp-cls-name=\"%s\", comp-cls-type=%d", + plugin_name, comp_class_name, comp_class_type); + + plugin = find_plugin(plugin_name); if (!plugin) { goto end; @@ -98,57 +126,30 @@ struct bt_component_class *find_component_class(const char *plugin_name, comp_class = bt_plugin_get_component_class_by_name_and_type(plugin, comp_class_name, comp_class_type); BT_PUT(plugin); + end: + if (BT_LOG_ON_DEBUG) { + if (comp_class) { + BT_LOGD("Found component class: comp-cls-addr=%p", + comp_class); + } else { + BT_LOGD("Cannot find component class."); + } + } + return comp_class; } static -void print_indent(size_t indent) +void print_indent(FILE *fp, size_t indent) { size_t i; for (i = 0; i < indent; i++) { - printf(" "); + fprintf(fp, " "); } } -static char *escape_name_for_shell(const char *input) -{ - char *output = g_malloc0(strlen(input) * 5 + 1); - const char *in; - char *out = output; - - if (!output) { - goto end; - } - - for (in = input; *in != '\0'; in++) { - switch (*in) { - case '\\': - *out++ = '\\'; - *out++ = '\\'; - break; - case '\'': - *out++ = '\''; - *out++ = '"'; - *out++ = '\''; - *out++ = '"'; - *out++ = '\''; - break; - case '.': - *out++ = '\\'; - *out++ = '.'; - break; - default: - *out++ = *in; - break; - } - } - -end: - return output; -} - static const char *component_type_str(enum bt_component_class_type type) { @@ -165,18 +166,19 @@ const char *component_type_str(enum bt_component_class_type type) } } -static void print_plugin_comp_cls_opt(FILE *fh, const char *plugin_name, +static +void print_plugin_comp_cls_opt(FILE *fh, const char *plugin_name, const char *comp_cls_name, enum bt_component_class_type type) { - char *shell_plugin_name = NULL; - char *shell_comp_cls_name = NULL; + GString *shell_plugin_name = NULL; + GString *shell_comp_cls_name = NULL; - shell_plugin_name = escape_name_for_shell(plugin_name); + shell_plugin_name = bt_common_shell_quote(plugin_name, false); if (!shell_plugin_name) { goto end; } - shell_comp_cls_name = escape_name_for_shell(comp_cls_name); + shell_comp_cls_name = bt_common_shell_quote(comp_cls_name, false); if (!shell_comp_cls_name) { goto end; } @@ -189,56 +191,67 @@ static void print_plugin_comp_cls_opt(FILE *fh, const char *plugin_name, bt_common_color_fg_default(), bt_common_color_bold(), bt_common_color_fg_blue(), - shell_plugin_name, + shell_plugin_name->str, bt_common_color_fg_default(), bt_common_color_fg_yellow(), - shell_comp_cls_name, + shell_comp_cls_name->str, bt_common_color_reset()); end: - g_free(shell_plugin_name); - g_free(shell_comp_cls_name); + 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(struct bt_value *, size_t); +void print_value(FILE *, struct bt_value *, size_t); static -void print_value_rec(struct bt_value *, size_t); +void print_value_rec(FILE *, struct bt_value *, size_t); + +struct print_map_value_data { + size_t indent; + FILE *fp; +}; static -bool print_map_value(const char *key, struct bt_value *object, void *data) +bt_bool print_map_value(const char *key, struct bt_value *object, void *data) { - size_t *indent = data; + struct print_map_value_data *print_map_value_data = data; - print_indent(*indent); - printf("%s: ", key); + print_indent(print_map_value_data->fp, print_map_value_data->indent); + fprintf(print_map_value_data->fp, "%s: ", key); if (bt_value_is_array(object) && bt_value_array_is_empty(object)) { - printf("[ ]\n"); + fprintf(print_map_value_data->fp, "[ ]\n"); return true; } if (bt_value_is_map(object) && bt_value_map_is_empty(object)) { - printf("{ }\n"); + fprintf(print_map_value_data->fp, "{ }\n"); return true; } if (bt_value_is_array(object) || bt_value_is_map(object)) { - printf("\n"); + fprintf(print_map_value_data->fp, "\n"); } - print_value_rec(object, *indent + 2); - return true; + print_value_rec(print_map_value_data->fp, object, + print_map_value_data->indent + 2); + return BT_TRUE; } static -void print_value_rec(struct bt_value *value, size_t indent) +void print_value_rec(FILE *fp, struct bt_value *value, size_t indent) { - bool bool_val; + bt_bool bool_val; int64_t int_val; double dbl_val; const char *str_val; @@ -251,30 +264,30 @@ void print_value_rec(struct bt_value *value, size_t indent) switch (bt_value_get_type(value)) { case BT_VALUE_TYPE_NULL: - printf("%snull%s\n", bt_common_color_bold(), + fprintf(fp, "%snull%s\n", bt_common_color_bold(), bt_common_color_reset()); break; case BT_VALUE_TYPE_BOOL: bt_value_bool_get(value, &bool_val); - printf("%s%s%s%s\n", bt_common_color_bold(), + 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); - printf("%s%s%" PRId64 "%s\n", bt_common_color_bold(), + 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); - printf("%s%s%lf%s\n", bt_common_color_bold(), + 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); - printf("%s%s%s%s\n", bt_common_color_bold(), + fprintf(fp, "%s%s%s%s\n", bt_common_color_bold(), bt_common_color_fg_green(), str_val, bt_common_color_reset()); break; @@ -283,8 +296,8 @@ void print_value_rec(struct bt_value *value, size_t indent) assert(size >= 0); if (size == 0) { - print_indent(indent); - printf("[ ]\n"); + print_indent(fp, indent); + fprintf(fp, "[ ]\n"); break; } @@ -293,70 +306,77 @@ void print_value_rec(struct bt_value *value, size_t indent) bt_value_array_get(value, i); assert(element); - print_indent(indent); - printf("- "); + print_indent(fp, indent); + fprintf(fp, "- "); if (bt_value_is_array(element) && bt_value_array_is_empty(element)) { - printf("[ ]\n"); + fprintf(fp, "[ ]\n"); continue; } if (bt_value_is_map(element) && bt_value_map_is_empty(element)) { - printf("{ }\n"); + fprintf(fp, "{ }\n"); continue; } if (bt_value_is_array(element) || bt_value_is_map(element)) { - printf("\n"); + fprintf(fp, "\n"); } - print_value_rec(element, indent + 2); + print_value_rec(fp, element, indent + 2); BT_PUT(element); } break; case BT_VALUE_TYPE_MAP: + { + struct print_map_value_data data = { + .indent = indent, + .fp = fp, + }; + if (bt_value_map_is_empty(value)) { - print_indent(indent); - printf("{ }\n"); + print_indent(fp, indent); + fprintf(fp, "{ }\n"); break; } - bt_value_map_foreach(value, print_map_value, &indent); + bt_value_map_foreach(value, print_map_value, &data); break; + } default: assert(false); } } static -void print_value(struct bt_value *value, size_t indent) +void print_value(FILE *fp, struct bt_value *value, size_t indent) { if (!bt_value_is_array(value) && !bt_value_is_map(value)) { - print_indent(indent); + print_indent(fp, indent); } - print_value_rec(value, indent); + print_value_rec(fp, value, indent); } static void print_bt_config_component(struct bt_config_component *bt_config_component) { - printf(" "); - print_plugin_comp_cls_opt(stdout, bt_config_component->plugin_name->str, + fprintf(stderr, " "); + print_plugin_comp_cls_opt(stderr, bt_config_component->plugin_name->str, bt_config_component->comp_cls_name->str, bt_config_component->type); - printf(":\n"); + fprintf(stderr, ":\n"); if (bt_config_component->instance_name->len > 0) { - printf(" Name: %s\n", + fprintf(stderr, " Name: %s\n", bt_config_component->instance_name->str); } - printf(" Parameters:\n"); - print_value(bt_config_component->params, 8); + fprintf(stderr, " Parameters:\n"); + print_value(stderr, bt_config_component->params, 8); } static @@ -375,8 +395,8 @@ void print_bt_config_components(GPtrArray *array) static void print_plugin_paths(struct bt_value *plugin_paths) { - printf(" Plugin paths:\n"); - print_value(plugin_paths, 4); + fprintf(stderr, " Plugin paths:\n"); + print_value(stderr, plugin_paths, 4); } static @@ -385,30 +405,30 @@ void print_cfg_run(struct bt_config *cfg) size_t i; print_plugin_paths(cfg->plugin_paths); - printf(" Source component instances:\n"); + fprintf(stderr, " Source component instances:\n"); print_bt_config_components(cfg->cmd_data.run.sources); if (cfg->cmd_data.run.filters->len > 0) { - printf(" Filter component instances:\n"); + fprintf(stderr, " Filter component instances:\n"); print_bt_config_components(cfg->cmd_data.run.filters); } - printf(" Sink component instances:\n"); + fprintf(stderr, " Sink component instances:\n"); print_bt_config_components(cfg->cmd_data.run.sinks); - printf(" Connections:\n"); + fprintf(stderr, " Connections:\n"); for (i = 0; i < cfg->cmd_data.run.connections->len; i++) { struct bt_config_connection *cfg_connection = g_ptr_array_index(cfg->cmd_data.run.connections, i); - printf(" %s%s%s -> %s%s%s\n", - cfg_connection->src_instance_name->str, - cfg_connection->src_port_name->len > 0 ? "." : "", - cfg_connection->src_port_name->str, - cfg_connection->dst_instance_name->str, - cfg_connection->dst_port_name->len > 0 ? "." : "", - cfg_connection->dst_port_name->str); + fprintf(stderr, " %s%s%s -> %s%s%s\n", + cfg_connection->upstream_comp_name->str, + cfg_connection->upstream_port_glob->len > 0 ? "." : "", + cfg_connection->upstream_port_glob->str, + cfg_connection->downstream_comp_name->str, + cfg_connection->downstream_port_glob->len > 0 ? "." : "", + cfg_connection->downstream_port_glob->str); } } @@ -428,35 +448,37 @@ static void print_cfg_print_ctf_metadata(struct bt_config *cfg) { print_plugin_paths(cfg->plugin_paths); - printf(" Path: %s\n", cfg->cmd_data.print_ctf_metadata.path->str); + fprintf(stderr, " Path: %s\n", + cfg->cmd_data.print_ctf_metadata.path->str); } static void print_cfg_print_lttng_live_sessions(struct bt_config *cfg) { print_plugin_paths(cfg->plugin_paths); - printf(" URL: %s\n", cfg->cmd_data.print_lttng_live_sessions.url->str); + fprintf(stderr, " URL: %s\n", + cfg->cmd_data.print_lttng_live_sessions.url->str); } static void print_cfg_query(struct bt_config *cfg) { print_plugin_paths(cfg->plugin_paths); - printf(" Object: `%s`\n", cfg->cmd_data.query.object->str); - printf(" Component class:\n"); + fprintf(stderr, " Object: `%s`\n", cfg->cmd_data.query.object->str); + fprintf(stderr, " Component class:\n"); print_bt_config_component(cfg->cmd_data.query.cfg_component); } static void print_cfg(struct bt_config *cfg) { - if (!babeltrace_verbose) { + if (!BT_LOG_ON_INFO) { return; } - printf("Configuration:\n"); - printf(" Debug mode: %s\n", cfg->debug ? "yes" : "no"); - printf(" Verbose mode: %s\n", cfg->verbose ? "yes" : "no"); + BT_LOGI_STR("Configuration:"); + fprintf(stderr, " Debug mode: %s\n", cfg->debug ? "yes" : "no"); + fprintf(stderr, " Verbose mode: %s\n", cfg->verbose ? "yes" : "no"); switch (cfg->command) { case BT_CONFIG_COMMAND_RUN: @@ -483,168 +505,38 @@ void print_cfg(struct bt_config *cfg) } static -struct bt_component *create_trimmer(struct bt_config_component *source_cfg) -{ - struct bt_component *trimmer = NULL; - struct bt_component_class *trimmer_class = NULL; - struct bt_value *trimmer_params = NULL; - struct bt_value *value; - - trimmer_params = bt_value_map_create(); - if (!trimmer_params) { - goto end; - } - - value = bt_value_map_get(source_cfg->params, "begin"); - if (value) { - enum bt_value_status ret; - - ret = bt_value_map_insert(trimmer_params, "begin", - value); - BT_PUT(value); - if (ret) { - goto end; - } - } - value = bt_value_map_get(source_cfg->params, "end"); - if (value) { - enum bt_value_status ret; - - ret = bt_value_map_insert(trimmer_params, "end", - value); - BT_PUT(value); - if (ret) { - goto end; - } - } - value = bt_value_map_get(source_cfg->params, "clock-gmt"); - if (value) { - enum bt_value_status ret; - - ret = bt_value_map_insert(trimmer_params, "clock-gmt", - value); - BT_PUT(value); - if (ret) { - goto end; - } - } - - trimmer_class = find_component_class("utils", "trimmer", - BT_COMPONENT_CLASS_TYPE_FILTER); - if (!trimmer_class) { - fprintf(stderr, "Could not find trimmer component class. Aborting...\n"); - goto end; - } - trimmer = bt_component_create(trimmer_class, "source_trimmer", - trimmer_params); - if (!trimmer) { - goto end; - } -end: - bt_put(trimmer_params); - bt_put(trimmer_class); - return trimmer; -} - -static -int connect_source_sink(struct bt_graph *graph, - struct bt_component *source, - struct bt_config_component *source_cfg, - struct bt_component *sink) +void add_to_loaded_plugins(struct bt_plugin_set *plugin_set) { - int ret = 0; - struct bt_connection *connection = NULL; - struct bt_component *trimmer = NULL; - struct bt_port *source_port = - bt_component_source_get_default_output_port(source); - struct bt_port *sink_port = - bt_component_sink_get_default_input_port(sink); - struct bt_port *to_sink_port = NULL; - struct bt_port *trimmer_input_port = NULL; - - if (!source_port) { - fprintf(stderr, "Failed to find default source output port. Aborting...\n"); - ret = -1; - goto end; - } - if (!sink_port) { - fprintf(stderr, "Failed to find default sink input port. Aborting...\n"); - ret = -1; - goto end; - } - - if (bt_value_map_has_key(source_cfg->params, "begin") - || bt_value_map_has_key(source_cfg->params, "end")) { - /* A trimmer must be inserted in the graph. */ - trimmer = create_trimmer(source_cfg); - if (!trimmer) { - fprintf(stderr, "Failed to create trimmer component. Aborting...\n"); - ret = -1; - goto end; - } - - trimmer_input_port = bt_component_filter_get_default_input_port( - trimmer); - if (!trimmer_input_port) { - fprintf(stderr, "Failed to find trimmer input port. Aborting...\n"); - ret = -1; - goto end; - } - to_sink_port = bt_component_filter_get_default_output_port( - trimmer); - if (!to_sink_port) { - fprintf(stderr, "Failed to find trimmer output port. Aborting...\n"); - ret = -1; - goto end; - } + int64_t i; + int64_t count; - connection = bt_graph_connect_ports(graph, source_port, - trimmer_input_port); - if (!connection) { - fprintf(stderr, "Failed to connect source to trimmer. Aborting...\n"); - ret = -1; - goto end; - } - BT_PUT(connection); - } else { - BT_MOVE(to_sink_port, source_port); - } - - connection = bt_graph_connect_ports(graph, to_sink_port, sink_port); - if (!connection) { - fprintf(stderr, "Failed to connect to sink. Aborting...\n"); - ret = -1; - goto end; - } -end: - bt_put(trimmer); - bt_put(source_port); - bt_put(sink_port); - bt_put(to_sink_port); - bt_put(connection); - return ret; -} + count = bt_plugin_set_get_plugin_count(plugin_set); + assert(count >= 0); -static -void add_to_loaded_plugins(struct bt_plugin **plugins) -{ - while (*plugins) { - struct bt_plugin *plugin = *plugins; - /* Check if it's already loaded (from another path). */ + for (i = 0; i < count; i++) { + struct bt_plugin *plugin = + bt_plugin_set_get_plugin(plugin_set, i); struct bt_plugin *loaded_plugin = find_plugin(bt_plugin_get_name(plugin)); + assert(plugin); + if (loaded_plugin) { - printf_verbose("Not loading plugin `%s`: already loaded from `%s`\n", - bt_plugin_get_path(plugin), - bt_plugin_get_path(loaded_plugin)); - BT_PUT(loaded_plugin); - BT_PUT(plugin); + BT_LOGI("Not using plugin: another one already exists with the same name: " + "plugin-name=\"%s\", plugin-path=\"%s\", " + "existing-plugin-path=\"%s\"", + bt_plugin_get_name(plugin), + bt_plugin_get_path(plugin), + bt_plugin_get_path(loaded_plugin)); + bt_put(loaded_plugin); } else { - /* Transfer ownership to global array. */ - g_ptr_array_add(loaded_plugins, plugin); + /* Add to global array. */ + BT_LOGD("Adding plugin to loaded plugins: plugin-path=\"%s\"", + bt_plugin_get_name(plugin)); + g_ptr_array_add(loaded_plugins, bt_get(plugin)); } - *(plugins++) = NULL; + + bt_put(plugin); } } @@ -655,33 +547,31 @@ int load_dynamic_plugins(struct bt_value *plugin_paths) nr_paths = bt_value_array_size(plugin_paths); if (nr_paths < 0) { + BT_LOGE_STR("Cannot load dynamic plugins: no plugin path."); ret = -1; goto end; } + BT_LOGI("Loading dynamic plugins."); + for (i = 0; i < nr_paths; i++) { struct bt_value *plugin_path_value = NULL; const char *plugin_path; - struct bt_plugin **plugins; + struct bt_plugin_set *plugin_set; plugin_path_value = bt_value_array_get(plugin_paths, i); - if (bt_value_string_get(plugin_path_value, - &plugin_path)) { - BT_PUT(plugin_path_value); - continue; - } - - plugins = bt_plugin_create_all_from_dir(plugin_path, false); - if (!plugins) { - printf_debug("Unable to dynamically load plugins from path %s.\n", + bt_value_string_get(plugin_path_value, &plugin_path); + assert(plugin_path); + plugin_set = bt_plugin_create_all_from_dir(plugin_path, false); + if (!plugin_set) { + BT_LOGD("Unable to load dynamic plugins: path=\"%s\"", plugin_path); BT_PUT(plugin_path_value); continue; } - add_to_loaded_plugins(plugins); - free(plugins); - + add_to_loaded_plugins(plugin_set); + bt_put(plugin_set); BT_PUT(plugin_path_value); } end: @@ -692,42 +582,45 @@ static int load_static_plugins(void) { int ret = 0; - struct bt_plugin **plugins; + struct bt_plugin_set *plugin_set; - plugins = bt_plugin_create_all_from_static(); - if (!plugins) { - printf_debug("Unable to load static plugins.\n"); + BT_LOGI("Loading static plugins."); + plugin_set = bt_plugin_create_all_from_static(); + if (!plugin_set) { + BT_LOGE("Unable to load static plugins."); ret = -1; goto end; } - add_to_loaded_plugins(plugins); - free(plugins); + add_to_loaded_plugins(plugin_set); + bt_put(plugin_set); end: return ret; } -static int load_all_plugins(struct bt_value *plugin_paths) +static +int load_all_plugins(struct bt_value *plugin_paths) { int ret = 0; if (load_dynamic_plugins(plugin_paths)) { - fprintf(stderr, "Failed to load dynamic plugins.\n"); ret = -1; goto end; } if (load_static_plugins()) { - fprintf(stderr, "Failed to load static plugins.\n"); ret = -1; goto end; } + BT_LOGI("Loaded all plugins: count=%u", loaded_plugins->len); + end: return ret; } -static void print_plugin_info(struct bt_plugin *plugin) +static +void print_plugin_info(struct bt_plugin *plugin) { unsigned int major, minor, patch; const char *extra; @@ -773,7 +666,8 @@ static void print_plugin_info(struct bt_plugin *plugin) license ? license : "(Unknown)"); } -static int cmd_query(struct bt_config *cfg) +static +int cmd_query(struct bt_config *cfg) { int ret; struct bt_component_class *comp_cls = NULL; @@ -788,6 +682,11 @@ static int cmd_query(struct bt_config *cfg) 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\", " + "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(), @@ -805,6 +704,13 @@ static int cmd_query(struct bt_config *cfg) 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(), @@ -822,7 +728,7 @@ static int cmd_query(struct bt_config *cfg) goto end; } - print_value(results, 0); + print_value(stdout, results, 0); end: bt_put(comp_cls); @@ -830,7 +736,8 @@ end: return ret; } -static int cmd_help(struct bt_config *cfg) +static +int cmd_help(struct bt_config *cfg) { int ret; struct bt_plugin *plugin = NULL; @@ -843,6 +750,8 @@ static int cmd_help(struct bt_config *cfg) plugin = find_plugin(cfg->cmd_data.help.cfg_component->plugin_name->str); if (!plugin) { + BT_LOGE("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(), @@ -856,7 +765,7 @@ static int cmd_help(struct bt_config *cfg) printf(" %sComponent classes%s: %d\n", bt_common_color_bold(), bt_common_color_reset(), - bt_plugin_get_component_class_count(plugin)); + (int) bt_plugin_get_component_class_count(plugin)); if (cfg->cmd_data.help.cfg_component->type != @@ -868,6 +777,11 @@ static int cmd_help(struct bt_config *cfg) cfg->cmd_data.help.cfg_component->type); if (!needed_comp_cls) { + BT_LOGE("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(), @@ -886,7 +800,7 @@ static int cmd_help(struct bt_config *cfg) for (i = 0; i < bt_plugin_get_component_class_count(plugin); i++) { struct bt_component_class *comp_cls = - bt_plugin_get_component_class(plugin, i); + bt_plugin_get_component_class_by_index(plugin, i); const char *comp_class_name = bt_component_class_get_name(comp_cls); const char *comp_class_description = @@ -931,9 +845,10 @@ end: return ret; } -static int cmd_list_plugins(struct bt_config *cfg) +static +int cmd_list_plugins(struct bt_config *cfg) { - int ret; + int ret = 0; int plugins_count, component_classes_count = 0, i; ret = load_all_plugins(cfg->plugin_paths); @@ -942,18 +857,11 @@ static int cmd_list_plugins(struct bt_config *cfg) } printf("From the following plugin paths:\n\n"); - print_value(cfg->plugin_paths, 2); + print_value(stdout, cfg->plugin_paths, 2); printf("\n"); plugins_count = loaded_plugins->len; if (plugins_count == 0) { - fprintf(stderr, "%s%sNo plugins found.%s\n", - bt_common_color_bold(), bt_common_color_fg_red(), - bt_common_color_reset()); - fprintf(stderr, "\n"); - fprintf(stderr, "Please make sure your plugin search path is set correctly. You can use\n"); - fprintf(stderr, "the --plugin-path command-line option or the BABELTRACE_PLUGIN_PATH\n"); - fprintf(stderr, "environment variable.\n"); - ret = -1; + printf("No plugins found.\n"); goto end; } @@ -981,7 +889,7 @@ static int cmd_list_plugins(struct bt_config *cfg) print_plugin_info(plugin); if (component_classes_count == 0) { - printf(" %sComponent classes%s: (None)\n", + printf(" %sComponent classes%s: (none)\n", bt_common_color_bold(), bt_common_color_reset()); } else { @@ -992,7 +900,8 @@ static int cmd_list_plugins(struct bt_config *cfg) for (j = 0; j < component_classes_count; j++) { struct bt_component_class *comp_class = - bt_plugin_get_component_class(plugin, j); + bt_plugin_get_component_class_by_index( + plugin, j); const char *comp_class_name = bt_component_class_get_name(comp_class); const char *comp_class_description = @@ -1018,13 +927,15 @@ end: return ret; } -static int cmd_print_lttng_live_sessions(struct bt_config *cfg) +static +int cmd_print_lttng_live_sessions(struct bt_config *cfg) { printf("TODO\n"); return -1; } -static int cmd_print_ctf_metadata(struct bt_config *cfg) +static +int cmd_print_ctf_metadata(struct bt_config *cfg) { int ret = 0; struct bt_component_class *comp_cls = NULL; @@ -1041,6 +952,10 @@ static int cmd_print_ctf_metadata(struct bt_config *cfg) 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\", " + "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(), @@ -1069,6 +984,7 @@ static int cmd_print_ctf_metadata(struct bt_config *cfg) 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(), @@ -1078,6 +994,7 @@ static int cmd_print_ctf_metadata(struct bt_config *cfg) metadata_text_value = bt_value_map_get(results, "text"); if (!metadata_text_value) { + BT_LOGE_STR("Cannot find `text` string value in the resulting metadata info object."); ret = -1; goto end; } @@ -1094,120 +1011,631 @@ end: return 0; } -static int cmd_run(struct bt_config *cfg) +struct cmd_run_ctx { + /* Owned by this */ + GHashTable *components; + + /* Owned by this */ + struct bt_graph *graph; + + /* Weak */ + struct bt_config *cfg; + + bool connect_ports; +}; + +static +int cmd_run_ctx_connect_upstream_port_to_downstream_component( + struct cmd_run_ctx *ctx, struct bt_component *upstream_comp, + struct bt_port *upstream_port, + struct bt_config_connection *cfg_conn) { int ret = 0; - struct bt_component_class *source_class = NULL; - struct bt_component_class *sink_class = NULL; - struct bt_component *source = NULL, *sink = NULL; - struct bt_value *source_params = NULL, *sink_params = NULL; - struct bt_config_component *source_cfg = NULL, *sink_cfg = NULL; - struct bt_graph *graph = NULL; + GQuark downstreamp_comp_name_quark; + struct bt_component *downstream_comp; + int64_t downstream_port_count; + uint64_t i; + int64_t (*port_count_fn)(struct bt_component *); + struct bt_port *(*port_by_index_fn)(struct bt_component *, uint64_t); + void *conn = NULL; + + BT_LOGI("Connecting upstream port to the next available downstream 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); + downstreamp_comp_name_quark = g_quark_from_string( + cfg_conn->downstream_comp_name->str); + assert(downstreamp_comp_name_quark > 0); + downstream_comp = g_hash_table_lookup(ctx->components, + (gpointer) (long) downstreamp_comp_name_quark); + 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", + cfg_conn->arg->str); + goto error; + } + + if (bt_component_is_filter(downstream_comp)) { + port_count_fn = bt_component_filter_get_input_port_count; + port_by_index_fn = bt_component_filter_get_input_port_by_index; + } else if (bt_component_is_sink(downstream_comp)) { + port_count_fn = bt_component_sink_get_input_port_count; + port_by_index_fn = bt_component_sink_get_input_port_by_index; + } else { + /* + * Should never happen because the connections are + * validated before we get here. + */ + BT_LOGF("Invalid connection: downstream component is a source: " + "conn-arg=\"%s\"", cfg_conn->arg->str); + assert(false); + } - ret = load_all_plugins(cfg->plugin_paths); - if (ret) { - goto end; + downstream_port_count = port_count_fn(downstream_comp); + assert(downstream_port_count >= 0); + + for (i = 0; i < downstream_port_count; i++) { + struct bt_port *downstream_port = + port_by_index_fn(downstream_comp, i); + const char *downstream_port_name; + + assert(downstream_port); + + /* Skip port if it's already connected */ + if (bt_port_is_connected(downstream_port)) { + bt_put(downstream_port); + BT_LOGD("Skipping downstream port: already connected: " + "port-addr=%p, port-name=\"%s\"", + downstream_port, + bt_port_get_name(downstream_port)); + continue; + } + + downstream_port_name = bt_port_get_name(downstream_port); + assert(downstream_port_name); + + if (bt_common_star_glob_match( + cfg_conn->downstream_port_glob->str, -1ULL, + downstream_port_name, -1ULL)) { + /* We have a winner! */ + conn = bt_graph_connect_ports(ctx->graph, + upstream_port, downstream_port); + bt_put(downstream_port); + if (!conn) { + BT_LOGE("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-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, + "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; + } + + BT_LOGI("Connected component 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); + + goto end; + } + + bt_put(downstream_port); } - /* TODO handle more than 1 source and 1 sink. */ - if (cfg->cmd_data.run.sources->len != 1 || - cfg->cmd_data.run.sinks->len != 1) { - fprintf(stderr, "Only one source and one sink component class are supported. Aborting...\n"); + if (!conn) { + 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; + } + + goto end; + +error: + ret = -1; + +end: + bt_put(conn); + return ret; +} + +static +int cmd_run_ctx_connect_upstream_port(struct cmd_run_ctx *ctx, + struct bt_port *upstream_port) +{ + int ret = 0; + const char *upstream_port_name; + const char *upstream_comp_name; + struct bt_component *upstream_comp = NULL; + size_t i; + + assert(ctx); + assert(upstream_port); + upstream_port_name = bt_port_get_name(upstream_port); + assert(upstream_port_name); + upstream_comp = bt_port_get_component(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; } - source_cfg = bt_config_get_component(cfg->cmd_data.run.sources, 0); - source_params = bt_get(source_cfg->params); - source_class = find_component_class(source_cfg->plugin_name->str, - source_cfg->comp_cls_name->str, - BT_COMPONENT_CLASS_TYPE_SOURCE); - if (!source_class) { - fprintf(stderr, "Could not find "); - print_plugin_comp_cls_opt(stderr, source_cfg->plugin_name->str, - source_cfg->comp_cls_name->str, BT_COMPONENT_CLASS_TYPE_SOURCE); - fprintf(stderr, ". Aborting...\n"); - ret = -1; + upstream_comp_name = bt_component_get_name(upstream_comp); + assert(upstream_comp_name); + BT_LOGI("Connecting upstream port: comp-addr=%p, comp-name=\"%s\", " + "port-addr=%p, port-name=\"%s\"", + upstream_comp, upstream_comp_name, + upstream_port, upstream_port_name); + + for (i = 0; i < ctx->cfg->cmd_data.run.connections->len; i++) { + struct bt_config_connection *cfg_conn = + g_ptr_array_index( + ctx->cfg->cmd_data.run.connections, i); + + if (strcmp(cfg_conn->upstream_comp_name->str, + upstream_comp_name) == 0) { + if (bt_common_star_glob_match( + cfg_conn->upstream_port_glob->str, + -1ULL, upstream_port_name, -1ULL)) { + 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: " + "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: " + "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; + +end: + bt_put(upstream_comp); + return ret; +} + +static +void graph_port_added_listener(struct bt_port *port, void *data) +{ + struct bt_component *comp = NULL; + struct cmd_run_ctx *ctx = data; + + BT_LOGI("Port added to a graph's component: port-addr=%p, port-name=\"%s\"", + port, bt_port_get_name(port)); + + if (bt_port_is_connected(port)) { + BT_LOGW_STR("Port is already connected."); goto end; } - sink_cfg = bt_config_get_component(cfg->cmd_data.run.sinks, 0); - sink_params = bt_get(sink_cfg->params); - sink_class = find_component_class(sink_cfg->plugin_name->str, - sink_cfg->comp_cls_name->str, - BT_COMPONENT_CLASS_TYPE_SINK); - if (!sink_class) { - fprintf(stderr, "Could not find "); - print_plugin_comp_cls_opt(stderr, sink_cfg->plugin_name->str, - sink_cfg->comp_cls_name->str, BT_COMPONENT_CLASS_TYPE_SINK); - fprintf(stderr, ". Aborting...\n"); - ret = -1; + comp = bt_port_get_component(port); + if (!comp) { + BT_LOGW_STR("Port has no component."); goto end; } - graph = bt_graph_create(); - if (!graph) { - ret = -1; + if (!bt_port_is_output(port)) { + BT_LOGI_STR("Skipping input port."); goto end; } - source = bt_component_create(source_class, "source", source_params); - if (!source) { - fprintf(stderr, "Failed to instantiate selected source component. Aborting...\n"); - ret = -1; - goto end; - } + if (cmd_run_ctx_connect_upstream_port(ctx, port)) { + BT_LOGF_STR("Cannot connect upstream port."); + fprintf(stderr, "Added port could not be connected: aborting\n"); + abort(); + } + +end: + bt_put(comp); + return; +} + +static +void graph_port_removed_listener(struct bt_component *component, + struct bt_port *port, void *data) +{ + BT_LOGI("Port removed from a graph's component: comp-addr=%p, " + "comp-name=\"%s\", port-addr=%p, port-name=\"%s\"", + component, bt_component_get_name(component), + port, bt_port_get_name(port)); +} + +static +void graph_ports_connected_listener(struct bt_port *upstream_port, + struct bt_port *downstream_port, void *data) +{ + BT_LOGI("Graph's component ports connected: " + "upstream-port-addr=%p, upstream-port-name=\"%s\", " + "downstream-port-addr=%p, downstream-port-name=\"%s\"", + upstream_port, bt_port_get_name(upstream_port), + downstream_port, bt_port_get_name(downstream_port)); +} + +static +void graph_ports_disconnected_listener( + struct bt_component *upstream_component, + struct bt_component *downstream_component, + struct bt_port *upstream_port, struct bt_port *downstream_port, + void *data) +{ + BT_LOGI("Graph's component ports disconnected: " + "upstream-port-addr=%p, upstream-port-name=\"%s\", " + "downstream-port-addr=%p, downstream-port-name=\"%s\"", + upstream_port, bt_port_get_name(upstream_port), + downstream_port, bt_port_get_name(downstream_port)); +} + +static +void cmd_run_ctx_destroy(struct cmd_run_ctx *ctx) +{ + if (!ctx) { + return; + } + + if (ctx->components) { + g_hash_table_destroy(ctx->components); + ctx->components = NULL; + } + + BT_PUT(ctx->graph); + ctx->cfg = NULL; +} + +static +int cmd_run_ctx_init(struct cmd_run_ctx *ctx, struct bt_config *cfg) +{ + int ret = 0; + + ctx->cfg = cfg; + ctx->connect_ports = false; + ctx->components = g_hash_table_new_full(g_direct_hash, g_direct_equal, + NULL, bt_put); + if (!ctx->components) { + goto error; + } + + ctx->graph = bt_graph_create(); + if (!ctx->graph) { + goto error; + } + + ret = bt_graph_add_port_added_listener(ctx->graph, + graph_port_added_listener, ctx); + if (ret) { + goto error; + } + + ret = bt_graph_add_port_removed_listener(ctx->graph, + graph_port_removed_listener, ctx); + if (ret) { + goto error; + } + + ret = bt_graph_add_ports_connected_listener(ctx->graph, + graph_ports_connected_listener, ctx); + if (ret) { + goto error; + } + + ret = bt_graph_add_ports_disconnected_listener(ctx->graph, + graph_ports_disconnected_listener, ctx); + if (ret) { + goto error; + } + + goto end; + +error: + cmd_run_ctx_destroy(ctx); + ret = -1; + +end: + return ret; +} + +static +int cmd_run_ctx_create_components_from_config_components( + struct cmd_run_ctx *ctx, GPtrArray *cfg_components) +{ + size_t i; + struct bt_component_class *comp_cls = NULL; + struct bt_component *comp = NULL; + int ret = 0; + + for (i = 0; i < cfg_components->len; i++) { + struct bt_config_component *cfg_comp = + g_ptr_array_index(cfg_components, i); + GQuark quark; + + comp_cls = find_component_class(cfg_comp->plugin_name->str, + cfg_comp->comp_cls_name->str, cfg_comp->type); + if (!comp_cls) { + BT_LOGE("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; + } + + comp = bt_component_create(comp_cls, + cfg_comp->instance_name->str, cfg_comp->params); + if (!comp) { + BT_LOGE("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; + } + + BT_LOGI("Created and inserted component: comp-addr=%p, comp-name=\"%s\"", + comp, cfg_comp->instance_name->str); + quark = g_quark_from_string(cfg_comp->instance_name->str); + assert(quark > 0); + g_hash_table_insert(ctx->components, + (gpointer) (long) quark, comp); + comp = NULL; + BT_PUT(comp_cls); + } + + goto end; + +error: + ret = -1; + +end: + bt_put(comp); + bt_put(comp_cls); + return ret; +} + +static +int cmd_run_ctx_create_components(struct cmd_run_ctx *ctx) +{ + int ret = 0; + + /* + * Make sure that, during this phase, our graph's "port added" + * listener does not connect ports while we are creating the + * components because we have a special, initial phase for + * this. + */ + ctx->connect_ports = false; - sink = bt_component_create(sink_class, "sink", sink_params); - if (!sink) { - fprintf(stderr, "Failed to instantiate selected output component. Aborting...\n"); + ret = cmd_run_ctx_create_components_from_config_components( + ctx, ctx->cfg->cmd_data.run.sources); + if (ret) { ret = -1; goto end; } - ret = connect_source_sink(graph, source, source_cfg, sink); + ret = cmd_run_ctx_create_components_from_config_components( + ctx, ctx->cfg->cmd_data.run.filters); if (ret) { ret = -1; goto end; } + ret = cmd_run_ctx_create_components_from_config_components( + ctx, ctx->cfg->cmd_data.run.sinks); + if (ret) { + ret = -1; + goto end; + } + +end: + return ret; +} + +static +int cmd_run_ctx_connect_comp_ports(struct cmd_run_ctx *ctx, + struct bt_component *comp, + int64_t (*port_count_fn)(struct bt_component *), + struct bt_port *(*port_by_index_fn)(struct bt_component *, uint64_t)) +{ + int ret = 0; + int64_t count; + uint64_t i; + + count = port_count_fn(comp); + assert(count >= 0); + + for (i = 0; i < count; i++) { + struct bt_port *upstream_port = port_by_index_fn(comp, i); + + assert(upstream_port); + ret = cmd_run_ctx_connect_upstream_port(ctx, upstream_port); + bt_put(upstream_port); + if (ret) { + goto end; + } + } + +end: + return ret; +} + +static +int cmd_run_ctx_connect_ports(struct cmd_run_ctx *ctx) +{ + int ret = 0; + GHashTableIter iter; + gpointer g_name_quark, g_comp; + + ctx->connect_ports = true; + g_hash_table_iter_init(&iter, ctx->components); + + while (g_hash_table_iter_next(&iter, &g_name_quark, &g_comp)) { + if (bt_component_is_source(g_comp)) { + ret = cmd_run_ctx_connect_comp_ports(ctx, + g_comp, bt_component_source_get_output_port_count, + bt_component_source_get_output_port_by_index); + } else if (bt_component_is_filter(g_comp)) { + ret = cmd_run_ctx_connect_comp_ports(ctx, + g_comp, bt_component_filter_get_output_port_count, + bt_component_filter_get_output_port_by_index); + } + + if (ret) { + goto end; + } + } + +end: + return ret; +} + +static +int cmd_run(struct bt_config *cfg) +{ + int ret = 0; + struct cmd_run_ctx ctx = { 0 }; + + ret = load_all_plugins(cfg->plugin_paths); + if (ret) { + goto error; + } + + /* 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"); + 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"); + 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"); + goto error; + } + + BT_LOGI_STR("Running the graph."); + + /* Run the graph */ while (true) { - enum bt_graph_status graph_status; + enum bt_graph_status graph_status = bt_graph_run(ctx.graph); - graph_status = bt_graph_run(graph); switch (graph_status) { + case BT_GRAPH_STATUS_OK: + break; case BT_GRAPH_STATUS_AGAIN: - /* Wait for an arbitraty 500 ms. */ - usleep(500000); + if (cfg->cmd_data.run.retry_duration_us > 0) { + BT_LOGV("Got BT_GRAPH_STATUS_AGAIN: sleeping: " + "time-us=%" PRIu64, + cfg->cmd_data.run.retry_duration_us); + + if (usleep(cfg->cmd_data.run.retry_duration_us)) { + // TODO: check EINTR and signal handler + } + } break; case BT_COMPONENT_STATUS_END: goto end; default: - fprintf(stderr, "Sink component returned an error, aborting...\n"); - ret = -1; - goto end; + BT_LOGE_STR("Graph failed to complete successfully"); + fprintf(stderr, "Graph failed to complete successfully\n"); + goto error; } } + goto end; + +error: + if (ret == 0) { + ret = -1; + } + end: - bt_put(sink_class); - bt_put(source_class); - bt_put(source); - bt_put(sink); - bt_put(source_params); - bt_put(sink_params); - bt_put(sink_cfg); - bt_put(source_cfg); - bt_put(graph); + cmd_run_ctx_destroy(&ctx); return ret; } -static void warn_command_name_and_directory_clash(struct bt_config *cfg) +static +void warn_command_name_and_directory_clash(struct bt_config *cfg) { + const char *env_clash; + if (!cfg->command_name) { return; } + env_clash = getenv(ENV_BABELTRACE_WARN_COMMAND_NAME_DIRECTORY_CLASH); + if (env_clash && strcmp(env_clash, "0") == 0) { + return; + } + 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", @@ -1220,31 +1648,79 @@ static void warn_command_name_and_directory_clash(struct bt_config *cfg) } } +static +void init_log_level(void) +{ + enum bt_logging_level log_level = BT_LOG_NONE; + const char *log_level_env = getenv("BABELTRACE_CLI_LOG_LEVEL"); + + if (!log_level_env) { + goto set_level; + } + + if (strcmp(log_level_env, "VERBOSE") == 0) { + log_level = BT_LOGGING_LEVEL_VERBOSE; + } else if (strcmp(log_level_env, "DEBUG") == 0) { + log_level = BT_LOGGING_LEVEL_DEBUG; + } else if (strcmp(log_level_env, "INFO") == 0) { + log_level = BT_LOGGING_LEVEL_INFO; + } else if (strcmp(log_level_env, "WARN") == 0) { + log_level = BT_LOGGING_LEVEL_WARN; + } else if (strcmp(log_level_env, "ERROR") == 0) { + log_level = BT_LOGGING_LEVEL_ERROR; + } else if (strcmp(log_level_env, "FATAL") == 0) { + log_level = BT_LOGGING_LEVEL_FATAL; + } else if (strcmp(log_level_env, "NONE") == 0) { + log_level = BT_LOGGING_LEVEL_NONE; + } + +set_level: + bt_cli_log_level = log_level; +} + int main(int argc, const char **argv) { int ret; int retcode; struct bt_config *cfg; - init_loaded_plugins_array(); - cfg = bt_config_from_args_with_defaults(argc, argv, &retcode); + init_log_level(); + init_static_data(); + cfg = bt_config_cli_args_create_with_default(argc, argv, &retcode); if (retcode < 0) { /* Quit without errors; typically usage/version */ retcode = 0; + BT_LOGI_STR("Quitting without errors."); goto end; } if (retcode > 0) { + BT_LOGE("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"); retcode = 1; goto end; } + if (cfg->verbose) { + bt_cli_log_level = BT_LOGGING_LEVEL_VERBOSE; + bt_logging_set_global_level(BT_LOGGING_LEVEL_VERBOSE); + // TODO: for backward compat., set the log level + // environment variables of the known plugins + // to VERBOSE + } else if (cfg->debug) { + bt_cli_log_level = BT_LOGGING_LEVEL_DEBUG; + bt_logging_set_global_level(BT_LOGGING_LEVEL_DEBUG); + // TODO: for backward compat., set the log level + // environment variables of the known plugins + // to DEBUG + } + babeltrace_debug = cfg->debug; babeltrace_verbose = cfg->verbose; print_cfg(cfg); @@ -1252,11 +1728,15 @@ int main(int argc, const char **argv) if (cfg->command_needs_plugins) { ret = load_all_plugins(cfg->plugin_paths); if (ret) { + BT_LOGE("Failed to load plugins: ret=%d", ret); retcode = 1; goto end; } } + BT_LOGI("Executing command: cmd=%d, command-name=\"%s\"", + cfg->command, cfg->command_name); + switch (cfg->command) { case BT_CONFIG_COMMAND_RUN: ret = cmd_run(cfg); @@ -1277,6 +1757,7 @@ int main(int argc, const char **argv) ret = cmd_print_lttng_live_sessions(cfg); break; default: + BT_LOGF("Invalid command: cmd=%d", cfg->command); assert(false); } @@ -1285,6 +1766,6 @@ int main(int argc, const char **argv) end: BT_PUT(cfg); - fini_loaded_plugins_array(); + fini_static_data(); return retcode; }