X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2Fbabeltrace.c;h=dfa4512d627208959b944ae8e933ca9dd00cb650;hb=a310d6bdad7372b9d8b5d85519ea8a46fe911643;hp=e547c40f19849db8aaab5d840077f6560657cfa8;hpb=cc3083746886be8518d7c1c31541c6047a3ad43f;p=babeltrace.git diff --git a/cli/babeltrace.c b/cli/babeltrace.c index e547c40f..dfa4512d 100644 --- a/cli/babeltrace.c +++ b/cli/babeltrace.c @@ -26,21 +26,12 @@ * SOFTWARE. */ +#define BT_LOG_TAG "CLI" +#include "logging.h" + #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include #include @@ -54,22 +45,65 @@ #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" +#define ENV_BABELTRACE_CLI_LOG_LEVEL "BABELTRACE_CLI_LOG_LEVEL" +#define NSEC_PER_SEC 1000000000LL + +/* + * Known environment variable names for the log levels of the project's + * modules. + */ +static const char* log_level_env_var_names[] = { + "BABELTRACE_COMMON_LOG_LEVEL", + "BABELTRACE_COMPAT_LOG_LEVEL", + "BABELTRACE_PLUGIN_CTF_BTR_LOG_LEVEL", + "BABELTRACE_SINK_CTF_FS_LOG_LEVEL", + "BABELTRACE_SRC_CTF_FS_LOG_LEVEL", + "BABELTRACE_SRC_CTF_LTTNG_LIVE_LOG_LEVEL", + "BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL", + "BABELTRACE_PLUGIN_CTF_NOTIF_ITER_LOG_LEVEL", + "BABELTRACE_PLUGIN_CTFCOPYTRACE_LIB_LOG_LEVEL", + "BABELTRACE_FLT_LTTNG_UTILS_DEBUG_INFO_LOG_LEVEL", + "BABELTRACE_SRC_TEXT_DMESG_LOG_LEVEL", + "BABELTRACE_SINK_TEXT_PRETTY_LOG_LEVEL", + "BABELTRACE_FLT_UTILS_MUXER_LOG_LEVEL", + "BABELTRACE_FLT_UTILS_TRIMMER_LOG_LEVEL", + "BABELTRACE_PYTHON_BT2_LOG_LEVEL", + "BABELTRACE_PYTHON_PLUGIN_PROVIDER_LOG_LEVEL", + NULL, +}; /* Application's processing graph (weak) */ static struct bt_graph *the_graph; +static struct bt_query_executor *the_query_executor; static bool canceled = false; GPtrArray *loaded_plugins; -BT_HIDDEN -int bt_cli_log_level = BT_LOG_NONE; +#ifdef __MINGW32__ +#include + +static +BOOL WINAPI signal_handler(DWORD signal) { + if (the_graph) { + bt_graph_cancel(the_graph); + } + + canceled = true; + + return TRUE; +} static -void sigint_handler(int signum) +void set_signal_handler(void) +{ + if (!SetConsoleCtrlHandler(signal_handler, TRUE)) { + BT_LOGE("Failed to set the ctrl+c handler."); + } +} +#else /* __MINGW32__ */ +static +void signal_handler(int signum) { if (signum != SIGINT) { return; @@ -79,9 +113,29 @@ void sigint_handler(int signum) bt_graph_cancel(the_graph); } + if (the_query_executor) { + bt_query_executor_cancel(the_query_executor); + } + canceled = true; } +static +void set_signal_handler(void) +{ + struct sigaction new_action, old_action; + + new_action.sa_handler = signal_handler; + sigemptyset(&new_action.sa_mask); + new_action.sa_flags = 0; + sigaction(SIGINT, NULL, &old_action); + + if (old_action.sa_handler != SIG_IGN) { + sigaction(SIGINT, &new_action, NULL); + } +} +#endif /* __MINGW32__ */ + static void init_static_data(void) { @@ -94,6 +148,116 @@ void fini_static_data(void) g_ptr_array_free(loaded_plugins, TRUE); } +static +int create_the_query_executor(void) +{ + int ret = 0; + + the_query_executor = bt_query_executor_create(); + if (!the_query_executor) { + BT_LOGE_STR("Cannot create a query executor."); + ret = -1; + } + + return ret; +} + +static +void destroy_the_query_executor(void) +{ + BT_PUT(the_query_executor); +} + +static +int query(struct bt_component_class *comp_cls, const char *obj, + struct bt_value *params, struct bt_value **user_result, + const char **fail_reason) +{ + struct bt_value *result = NULL; + enum bt_query_status status; + *fail_reason = "unknown error"; + int ret = 0; + + assert(fail_reason); + assert(user_result); + ret = create_the_query_executor(); + if (ret) { + /* create_the_query_executor() logs errors */ + goto end; + } + + if (canceled) { + BT_LOGI("Canceled by user before executing the query: " + "comp-cls-addr=%p, comp-cls-name=\"%s\", " + "query-obj=\"%s\"", comp_cls, + bt_component_class_get_name(comp_cls), obj); + *fail_reason = "canceled by user"; + goto error; + } + + while (true) { + status = bt_query_executor_query(the_query_executor, comp_cls, + obj, params, &result); + switch (status) { + case BT_QUERY_STATUS_OK: + goto ok; + case BT_QUERY_STATUS_AGAIN: + { + const uint64_t sleep_time_us = 100000; + + /* Wait 100 ms and retry */ + BT_LOGV("Got BT_QUERY_STATUS_AGAIN: sleeping: " + "time-us=%" PRIu64, sleep_time_us); + + if (usleep(sleep_time_us)) { + if (bt_query_executor_is_canceled(the_query_executor)) { + BT_LOGI("Query was canceled by user: " + "comp-cls-addr=%p, comp-cls-name=\"%s\", " + "query-obj=\"%s\"", comp_cls, + bt_component_class_get_name(comp_cls), + obj); + *fail_reason = "canceled by user"; + goto error; + } + } + + continue; + } + case BT_QUERY_STATUS_EXECUTOR_CANCELED: + *fail_reason = "canceled by user"; + goto error; + case BT_QUERY_STATUS_ERROR: + case BT_QUERY_STATUS_INVALID: + goto error; + case BT_QUERY_STATUS_INVALID_OBJECT: + *fail_reason = "invalid or unknown query object"; + goto error; + case BT_QUERY_STATUS_INVALID_PARAMS: + *fail_reason = "invalid query parameters"; + goto error; + case BT_QUERY_STATUS_NOMEM: + *fail_reason = "not enough memory"; + goto error; + default: + BT_LOGF("Unknown query status: status=%d", status); + abort(); + } + } + +ok: + *user_result = result; + result = NULL; + goto end; + +error: + ret = -1; + +end: + destroy_the_query_executor(); + bt_put(result); + return ret; +} + static struct bt_plugin *find_plugin(const char *name) { @@ -181,7 +345,7 @@ const char *component_type_str(enum bt_component_class_type type) return "filter"; case BT_COMPONENT_CLASS_TYPE_UNKNOWN: default: - return "unknown"; + return "(unknown)"; } } @@ -202,13 +366,11 @@ void print_plugin_comp_cls_opt(FILE *fh, const char *plugin_name, goto end; } - fprintf(fh, "%s%s--%s%s %s'%s%s%s%s.%s%s%s'", + fprintf(fh, "'%s%s%s%s.%s%s%s.%s%s%s'", bt_common_color_bold(), bt_common_color_fg_cyan(), component_type_str(type), - bt_common_color_reset(), bt_common_color_fg_default(), - bt_common_color_bold(), bt_common_color_fg_blue(), shell_plugin_name->str, bt_common_color_fg_default(), @@ -276,6 +438,7 @@ void print_value_rec(FILE *fp, struct bt_value *value, size_t indent) const char *str_val; int size; int i; + enum bt_value_status status; if (!value) { return; @@ -287,32 +450,46 @@ void print_value_rec(FILE *fp, struct bt_value *value, size_t indent) bt_common_color_reset()); break; case BT_VALUE_TYPE_BOOL: - bt_value_bool_get(value, &bool_val); + status = bt_value_bool_get(value, &bool_val); + if (status != BT_VALUE_STATUS_OK) { + goto error; + } 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); + status = bt_value_integer_get(value, &int_val); + if (status != BT_VALUE_STATUS_OK) { + goto error; + } 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); + status = bt_value_float_get(value, &dbl_val); + if (status != BT_VALUE_STATUS_OK) { + goto error; + } 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); + status = bt_value_string_get(value, &str_val); + if (status != BT_VALUE_STATUS_OK) { + goto error; + } fprintf(fp, "%s%s%s%s\n", bt_common_color_bold(), bt_common_color_fg_green(), str_val, bt_common_color_reset()); break; case BT_VALUE_TYPE_ARRAY: size = bt_value_array_size(value); - assert(size >= 0); + if (size < 0) { + goto error; + } if (size == 0) { print_indent(fp, indent); @@ -324,7 +501,9 @@ void print_value_rec(FILE *fp, struct bt_value *value, size_t indent) struct bt_value *element = bt_value_array_get(value, i); - assert(element); + if (!element) { + goto error; + } print_indent(fp, indent); fprintf(fp, "- "); @@ -368,6 +547,11 @@ void print_value_rec(FILE *fp, struct bt_value *value, size_t indent) default: abort(); } + return; + +error: + BT_LOGE("Error printing value of type %s.", + bt_value_type_string(bt_value_get_type(value))); } static @@ -577,10 +761,28 @@ int load_dynamic_plugins(struct bt_value *plugin_paths) struct bt_value *plugin_path_value = NULL; const char *plugin_path; struct bt_plugin_set *plugin_set; + enum bt_value_status status; plugin_path_value = bt_value_array_get(plugin_paths, i); - bt_value_string_get(plugin_path_value, &plugin_path); - assert(plugin_path); + status = bt_value_string_get(plugin_path_value, &plugin_path); + if (status != BT_VALUE_STATUS_OK) { + BT_LOGD_STR("Cannot get plugin path string."); + BT_PUT(plugin_path_value); + continue; + } + + /* + * Skip this if the directory does not exist because + * bt_plugin_create_all_from_dir() expects an existing + * directory. + */ + if (!g_file_test(plugin_path, G_FILE_TEST_IS_DIR)) { + BT_LOGV("Skipping nonexistent directory path: " + "path=\"%s\"", plugin_path); + BT_PUT(plugin_path_value); + continue; + } + plugin_set = bt_plugin_create_all_from_dir(plugin_path, false); if (!plugin_set) { BT_LOGD("Unable to load dynamic plugins: path=\"%s\"", @@ -660,8 +862,12 @@ void print_plugin_info(struct bt_plugin *plugin) printf("%s%s%s%s:\n", bt_common_color_bold(), bt_common_color_fg_blue(), plugin_name, bt_common_color_reset()); - printf(" %sPath%s: %s\n", bt_common_color_bold(), - bt_common_color_reset(), path ? path : "(None)"); + if (path) { + printf(" %sPath%s: %s\n", bt_common_color_bold(), + bt_common_color_reset(), path); + } else { + puts(" Built-in"); + } if (version_status == BT_PLUGIN_STATUS_OK) { printf(" %sVersion%s: %u.%u.%u", @@ -691,6 +897,7 @@ int cmd_query(struct bt_config *cfg) int ret = 0; struct bt_component_class *comp_cls = NULL; struct bt_value *results = NULL; + const char *fail_reason = NULL; comp_cls = find_component_class(cfg->cmd_data.query.cfg_component->plugin_name->str, cfg->cmd_data.query.cfg_component->comp_cls_name->str, @@ -714,35 +921,39 @@ int cmd_query(struct bt_config *cfg) goto end; } - results = bt_component_class_query(comp_cls, - 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(), - 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\n", - bt_common_color_bold(), - bt_common_color_fg_red(), - cfg->cmd_data.query.object->str, - bt_common_color_reset()); - ret = -1; - goto end; + ret = query(comp_cls, cfg->cmd_data.query.object->str, + cfg->cmd_data.query.cfg_component->params, &results, + &fail_reason); + if (ret) { + goto failed; } print_value(stdout, results, 0); + goto end; + +failed: + BT_LOGE("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: bt_put(comp_cls); @@ -824,9 +1035,8 @@ int cmd_help(struct bt_config *cfg) if (cfg->cmd_data.help.cfg_component->type != BT_COMPONENT_CLASS_TYPE_UNKNOWN) { if (strcmp(cfg->cmd_data.help.cfg_component->comp_cls_name->str, - comp_class_name) != 0 && - type == - cfg->cmd_data.help.cfg_component->type) { + comp_class_name) != 0 || + type != cfg->cmd_data.help.cfg_component->type) { bt_put(comp_cls); continue; } @@ -945,6 +1155,8 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg) static const enum bt_component_class_type comp_cls_type = BT_COMPONENT_CLASS_TYPE_SOURCE; int64_t array_size, i; + const char *fail_reason = NULL; + FILE *out_stream = stdout; assert(cfg->cmd_data.print_lttng_live_sessions.url); comp_cls = find_component_class(plugin_name, comp_cls_name, @@ -975,15 +1187,9 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg) goto error; } - results = bt_component_class_query(comp_cls, "sessions", - params); - if (!results) { - BT_LOGE_STR("Failed to query for sessions."); - fprintf(stderr, "%s%sFailed to request sessions%s\n", - bt_common_color_bold(), - bt_common_color_fg_red(), - bt_common_color_reset()); - goto error; + ret = query(comp_cls, "sessions", params, &results, &fail_reason); + if (ret) { + goto failed; } if (!bt_value_is_array(results)) { @@ -995,6 +1201,19 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg) goto error; } + if (cfg->cmd_data.print_lttng_live_sessions.output_path->len > 0) { + out_stream = + 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); + goto end; + } + } + array_size = bt_value_array_size(results); for (i = 0; i < array_size; i++) { const char *url_text; @@ -1017,7 +1236,7 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg) } ret = bt_value_string_get(v, &url_text); assert(ret == 0); - printf("%s", url_text); + fprintf(out_stream, "%s", url_text); BT_PUT(v); v = bt_value_map_get(map, "timer-us"); @@ -1027,7 +1246,7 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg) } ret = bt_value_integer_get(v, &timer_us); assert(ret == 0); - printf(" (timer = %" PRIu64 ", ", timer_us); + fprintf(out_stream, " (timer = %" PRIu64 ", ", timer_us); BT_PUT(v); v = bt_value_map_get(map, "stream-count"); @@ -1037,7 +1256,7 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg) } ret = bt_value_integer_get(v, &streams); assert(ret == 0); - printf("%" PRIu64 " stream(s), ", streams); + fprintf(out_stream, "%" PRIu64 " stream(s), ", streams); BT_PUT(v); v = bt_value_map_get(map, "client-count"); @@ -1047,22 +1266,43 @@ int cmd_print_lttng_live_sessions(struct bt_config *cfg) } ret = bt_value_integer_get(v, &clients); assert(ret == 0); - printf("%" PRIu64 " client(s) connected)\n", clients); + fprintf(out_stream, "%" PRIu64 " client(s) connected)\n", clients); BT_PUT(v); BT_PUT(map); } + + 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()); + +error: + ret = -1; + end: bt_put(v); bt_put(map); bt_put(results); bt_put(params); bt_put(comp_cls); - return 0; -error: - ret = -1; - goto end; + if (out_stream && out_stream != stdout) { + int fclose_ret = fclose(out_stream); + + if (fclose_ret) { + BT_LOGE_ERRNO("Cannot close file stream", + ": path=\"%s\"", + cfg->cmd_data.print_lttng_live_sessions.output_path->str); + } + } + + return 0; } static @@ -1078,6 +1318,8 @@ int cmd_print_ctf_metadata(struct bt_config *cfg) static const char * const comp_cls_name = "fs"; static const enum bt_component_class_type comp_cls_type = BT_COMPONENT_CLASS_TYPE_SOURCE; + const char *fail_reason = NULL; + FILE *out_stream = stdout; assert(cfg->cmd_data.print_ctf_metadata.path); comp_cls = find_component_class(plugin_name, comp_cls_name, @@ -1111,16 +1353,9 @@ int cmd_print_ctf_metadata(struct bt_config *cfg) goto end; } - results = bt_component_class_query(comp_cls, "metadata-info", - 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(), - bt_common_color_reset()); - goto end; + ret = query(comp_cls, "metadata-info", params, &results, &fail_reason); + if (ret) { + goto failed; } metadata_text_value = bt_value_map_get(results, "text"); @@ -1132,16 +1367,104 @@ int cmd_print_ctf_metadata(struct bt_config *cfg) ret = bt_value_string_get(metadata_text_value, &metadata_text); assert(ret == 0); - printf("%s\n", metadata_text); + + if (cfg->cmd_data.print_ctf_metadata.output_path->len > 0) { + out_stream = + 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); + goto end; + } + } + + ret = fprintf(out_stream, "%s\n", metadata_text); + if (ret < 0) { + BT_LOGE("Cannot write whole metadata text to output stream: " + "ret=%d", ret); + } + + 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()); end: + destroy_the_query_executor(); bt_put(results); bt_put(params); bt_put(metadata_text_value); bt_put(comp_cls); + + if (out_stream && out_stream != stdout) { + int fclose_ret = fclose(out_stream); + + if (fclose_ret) { + BT_LOGE_ERRNO("Cannot close file stream", + ": path=\"%s\"", + cfg->cmd_data.print_ctf_metadata.output_path->str); + } + } + return 0; } +struct port_id { + char *instance_name; + char *port_name; +}; + +struct trace_range { + uint64_t intersection_range_begin_ns; + uint64_t intersection_range_end_ns; +}; + +static +guint port_id_hash(gconstpointer v) +{ + const struct port_id *id = v; + + assert(id->instance_name); + assert(id->port_name); + + return g_str_hash(id->instance_name) ^ g_str_hash(id->port_name); +} + +static +gboolean port_id_equal(gconstpointer v1, gconstpointer v2) +{ + const struct port_id *id1 = v1; + const struct port_id *id2 = v2; + + return !strcmp(id1->instance_name, id2->instance_name) && + !strcmp(id1->port_name, id2->port_name); +} + +static +void port_id_destroy(gpointer data) +{ + struct port_id *id = data; + + free(id->instance_name); + free(id->port_name); + free(id); +} + +static +void trace_range_destroy(gpointer data) +{ + free(data); +} + struct cmd_run_ctx { /* Owned by this */ GHashTable *components; @@ -1153,8 +1476,60 @@ struct cmd_run_ctx { struct bt_config *cfg; bool connect_ports; + + bool stream_intersection_mode; + + /* + * Association of struct port_id -> struct trace_range. + */ + GHashTable *intersections; }; +/* Returns a timestamp of the form "(-)s.ns" */ +static +char *s_from_ns(int64_t ns) +{ + int ret; + char *s_ret = NULL; + bool is_negative; + int64_t ts_sec_abs, ts_nsec_abs; + int64_t ts_sec = ns / NSEC_PER_SEC; + int64_t ts_nsec = ns % NSEC_PER_SEC; + + if (ts_sec >= 0 && ts_nsec >= 0) { + is_negative = false; + ts_sec_abs = ts_sec; + ts_nsec_abs = ts_nsec; + } else if (ts_sec > 0 && ts_nsec < 0) { + is_negative = false; + ts_sec_abs = ts_sec - 1; + ts_nsec_abs = NSEC_PER_SEC + ts_nsec; + } else if (ts_sec == 0 && ts_nsec < 0) { + is_negative = true; + ts_sec_abs = ts_sec; + ts_nsec_abs = -ts_nsec; + } else if (ts_sec < 0 && ts_nsec > 0) { + is_negative = true; + ts_sec_abs = -(ts_sec + 1); + ts_nsec_abs = NSEC_PER_SEC - ts_nsec; + } else if (ts_sec < 0 && ts_nsec == 0) { + is_negative = true; + ts_sec_abs = -ts_sec; + ts_nsec_abs = ts_nsec; + } else { /* (ts_sec < 0 && ts_nsec < 0) */ + is_negative = true; + ts_sec_abs = -ts_sec; + ts_nsec_abs = -ts_nsec; + } + + ret = asprintf(&s_ret, "%s%" PRId64 ".%09" PRId64, + is_negative ? "-" : "", ts_sec_abs, ts_nsec_abs); + if (ret < 0) { + s_ret = NULL; + } + return s_ret; +} + static int cmd_run_ctx_connect_upstream_port_to_downstream_component( struct cmd_run_ctx *ctx, struct bt_component *upstream_comp, @@ -1168,7 +1543,67 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component( 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; + enum bt_graph_status status = BT_GRAPH_STATUS_ERROR; + bool insert_trimmer = false; + struct bt_value *trimmer_params = NULL; + char *intersection_begin = NULL; + char *intersection_end = NULL; + struct bt_component *trimmer = NULL; + struct bt_component_class *trimmer_class = NULL; + struct bt_port *trimmer_input = NULL; + struct bt_port *trimmer_output = NULL; + + if (ctx->intersections && + bt_component_get_class_type(upstream_comp) == + BT_COMPONENT_CLASS_TYPE_SOURCE) { + struct trace_range *range; + struct port_id port_id = { + .instance_name = (char *) bt_component_get_name(upstream_comp), + .port_name = (char *) bt_port_get_name(upstream_port) + }; + + if (!port_id.instance_name || !port_id.port_name) { + goto error; + } + + range = (struct trace_range *) g_hash_table_lookup( + ctx->intersections, &port_id); + if (range) { + enum bt_value_status 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."); + goto error; + } + + insert_trimmer = true; + trimmer_params = bt_value_map_create(); + if (!trimmer_params) { + goto error; + } + + status = bt_value_map_insert_string(trimmer_params, + "begin", intersection_begin); + if (status != BT_VALUE_STATUS_OK) { + goto error; + } + status = bt_value_map_insert_string(trimmer_params, + "end", intersection_end); + if (status != BT_VALUE_STATUS_OK) { + goto error; + } + } + + trimmer_class = find_component_class("utils", "trimmer", + BT_COMPONENT_CLASS_TYPE_FILTER); + if (!trimmer_class) { + goto error; + } + } BT_LOGI("Connecting upstream port to the next available downstream port: " "upstream-port-addr=%p, upstream-port-name=\"%s\", " @@ -1180,7 +1615,7 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component( 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); + GUINT_TO_POINTER(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, @@ -1212,11 +1647,12 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component( for (i = 0; i < downstream_port_count; i++) { struct bt_port *downstream_port = port_by_index_fn(downstream_comp, i); + const char *upstream_port_name; const char *downstream_port_name; assert(downstream_port); - /* Skip port if it's already connected */ + /* 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: " @@ -1228,35 +1664,89 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component( downstream_port_name = bt_port_get_name(downstream_port); assert(downstream_port_name); + upstream_port_name = bt_port_get_name(upstream_port); + assert(upstream_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); + if (!bt_common_star_glob_match( + cfg_conn->downstream_port_glob->str, SIZE_MAX, + downstream_port_name, SIZE_MAX)) { 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); + continue; + } + + if (insert_trimmer) { + /* + * In order to insert the trimmer between the two + * components that were being connected, we create + * a connection configuration entry which describes + * a connection from the trimmer's output to the + * original input that was being connected. + * + * Hence, the creation of the trimmer will cause the + * graph "new port" listener to establish all downstream + * connections as its output port is connected. We will + * then establish the connection between the original + * upstream source and the trimmer. + */ + char *trimmer_name = NULL; + enum bt_graph_status graph_status; + + ret = asprintf(&trimmer_name, "%s-%s", + "stream-intersection-trimmer", + upstream_port_name); + if (ret < 0) { + goto error; + } + ret = 0; + + ctx->connect_ports = false; + graph_status = bt_graph_add_component(ctx->graph, + trimmer_class, trimmer_name, trimmer_params, + &trimmer); + free(trimmer_name); + if (graph_status != BT_GRAPH_STATUS_OK) { goto error; } + assert(trimmer); - BT_LOGI("Connected component ports: " + trimmer_input = + bt_component_filter_get_input_port_by_index( + trimmer, 0); + if (!trimmer_input) { + goto error; + } + trimmer_output = + bt_component_filter_get_output_port_by_index( + trimmer, 0); + if (!trimmer_output) { + goto error; + } + + /* + * Replace the current downstream port by the trimmer's + * upstream port. + */ + BT_MOVE(downstream_port, trimmer_input); + downstream_port_name = bt_port_get_name( + downstream_port); + if (!downstream_port_name) { + goto error; + } + } + + /* We have a winner! */ + status = bt_graph_connect_ports(ctx->graph, + upstream_port, downstream_port, NULL); + BT_PUT(downstream_port); + switch (status) { + case BT_GRAPH_STATUS_OK: + break; + case BT_GRAPH_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\", " @@ -1267,33 +1757,87 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component( downstream_comp, cfg_conn->downstream_comp_name->str, downstream_port, downstream_port_name, cfg_conn->arg->str); - - goto end; + 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: " + "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_put(downstream_port); - } - - if (!conn) { - BT_LOGE("Cannot create connection: cannot find a matching downstream port for upstream port: " + BT_LOGI("Connected component ports: " + "upstream-comp-addr=%p, upstream-comp-name=\"%s\", " "upstream-port-addr=%p, upstream-port-name=\"%s\", " - "downstream-comp-name=\"%s\", conn-arg=\"%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), - cfg_conn->downstream_comp_name->str, + downstream_comp, cfg_conn->downstream_comp_name->str, + downstream_port, downstream_port_name, 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; + + if (insert_trimmer) { + /* + * The first connection, from the source to the trimmer, + * has been done. We now connect the trimmer to the + * original downstream port. + */ + ret = cmd_run_ctx_connect_upstream_port_to_downstream_component( + ctx, trimmer, trimmer_output, cfg_conn); + if (ret) { + goto error; + } + ctx->connect_ports = true; + } + + /* + * We found a matching downstream port: the search is + * over. + */ + goto end; } - goto end; + /* No downstream port found */ + 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); error: ret = -1; end: - bt_put(conn); + free(intersection_begin); + free(intersection_end); + BT_PUT(trimmer_params); + BT_PUT(trimmer_class); + BT_PUT(trimmer); + BT_PUT(trimmer_input); + BT_PUT(trimmer_output); return ret; } @@ -1333,29 +1877,31 @@ int cmd_run_ctx_connect_upstream_port(struct cmd_run_ctx *ctx, 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; - } + upstream_comp_name)) { + continue; + } - goto end; - } + if (!bt_common_star_glob_match( + cfg_conn->upstream_port_glob->str, + SIZE_MAX, upstream_port_name, SIZE_MAX)) { + continue; } + + 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: " @@ -1384,6 +1930,11 @@ void graph_port_added_listener(struct bt_port *port, void *data) "comp-name=\"%s\", port-addr=%p, port-name=\"%s\"", comp, comp ? bt_component_get_name(comp) : "", port, bt_port_get_name(port)); + + if (!ctx->connect_ports) { + goto end; + } + if (!comp) { BT_LOGW_STR("Port has no component."); goto end; @@ -1468,6 +2019,11 @@ void cmd_run_ctx_destroy(struct cmd_run_ctx *ctx) ctx->components = NULL; } + if (ctx->intersections) { + g_hash_table_destroy(ctx->intersections); + ctx->intersections = NULL; + } + BT_PUT(ctx->graph); the_graph = NULL; ctx->cfg = NULL; @@ -1486,6 +2042,15 @@ int cmd_run_ctx_init(struct cmd_run_ctx *ctx, struct bt_config *cfg) goto error; } + if (cfg->cmd_data.run.stream_intersection_mode) { + ctx->stream_intersection_mode = true; + ctx->intersections = g_hash_table_new_full(port_id_hash, + port_id_equal, port_id_destroy, trace_range_destroy); + if (!ctx->intersections) { + goto error; + } + } + ctx->graph = bt_graph_create(); if (!ctx->graph) { goto error; @@ -1493,28 +2058,28 @@ int cmd_run_ctx_init(struct cmd_run_ctx *ctx, struct bt_config *cfg) the_graph = ctx->graph; ret = bt_graph_add_port_added_listener(ctx->graph, - graph_port_added_listener, ctx); + graph_port_added_listener, NULL, ctx); if (ret < 0) { BT_LOGE_STR("Cannot add \"port added\" listener to graph."); goto error; } ret = bt_graph_add_port_removed_listener(ctx->graph, - graph_port_removed_listener, ctx); + graph_port_removed_listener, NULL, ctx); if (ret < 0) { BT_LOGE_STR("Cannot add \"port removed\" listener to graph."); goto error; } ret = bt_graph_add_ports_connected_listener(ctx->graph, - graph_ports_connected_listener, ctx); + graph_ports_connected_listener, NULL, ctx); if (ret < 0) { BT_LOGE_STR("Cannot add \"ports connected\" listener to graph."); goto error; } ret = bt_graph_add_ports_disconnected_listener(ctx->graph, - graph_ports_disconnected_listener, ctx); + graph_ports_disconnected_listener, NULL, ctx); if (ret < 0) { BT_LOGE_STR("Cannot add \"ports disconnected\" listener to graph."); goto error; @@ -1530,6 +2095,277 @@ end: return ret; } +static +int set_stream_intersections(struct cmd_run_ctx *ctx, + struct bt_config_component *cfg_comp, + struct bt_component_class *comp_cls) +{ + int ret = 0; + uint64_t trace_idx; + int64_t trace_count; + enum bt_value_status value_status; + const char *path = NULL; + struct bt_value *component_path_value = NULL; + struct bt_value *query_params = NULL; + struct bt_value *query_result = NULL; + struct bt_value *trace_info = NULL; + struct bt_value *intersection_range = NULL; + struct bt_value *intersection_begin = NULL; + struct bt_value *intersection_end = NULL; + struct bt_value *stream_path_value = NULL; + struct bt_value *stream_paths = NULL; + struct bt_value *stream_infos = NULL; + struct bt_value *stream_info = NULL; + struct port_id *port_id = NULL; + struct trace_range *trace_range = NULL; + const char *fail_reason = NULL; + + component_path_value = bt_value_map_get(cfg_comp->params, "path"); + if (!bt_value_is_string(component_path_value)) { + BT_LOGD("Cannot get path parameter: component-name=%s", + cfg_comp->instance_name->str); + ret = -1; + goto error; + } + + value_status = bt_value_string_get(component_path_value, &path); + if (value_status != BT_VALUE_STATUS_OK) { + BT_LOGD("Cannot get path string value: component-name=%s", + cfg_comp->instance_name->str); + ret = -1; + goto error; + } + + query_params = bt_value_map_create(); + if (!query_params) { + BT_LOGE_STR("Cannot create query parameters."); + ret = -1; + goto error; + } + + value_status = bt_value_map_insert(query_params, "path", component_path_value); + if (value_status != BT_VALUE_STATUS_OK) { + BT_LOGE_STR("Cannot insert path parameter in query parameter map."); + ret = -1; + goto error; + } + + ret = query(comp_cls, "trace-info", query_params, &query_result, + &fail_reason); + if (ret) { + BT_LOGD("Component class does not support the `trace-info` query: %s: " + "comp-class-name=\"%s\"", fail_reason, + bt_component_class_get_name(comp_cls)); + ret = -1; + goto error; + } + + if (!bt_value_is_array(query_result)) { + BT_LOGD("Unexpected format of \'trace-info\' query result: " + "component-class-name=%s", + bt_component_class_get_name(comp_cls)); + ret = -1; + goto error; + } + + trace_count = bt_value_array_size(query_result); + if (trace_count < 0) { + ret = -1; + goto error; + } + + for (trace_idx = 0; trace_idx < trace_count; trace_idx++) { + int64_t begin, end; + uint64_t stream_idx; + int64_t stream_count; + + trace_info = bt_value_array_get(query_result, trace_idx); + if (!trace_info || !bt_value_is_map(trace_info)) { + ret = -1; + BT_LOGD_STR("Cannot retrieve trace from query result."); + goto error; + } + + intersection_range = bt_value_map_get(trace_info, + "intersection-range-ns"); + if (!intersection_range) { + ret = -1; + BT_LOGD_STR("Cannot retrieve \'intersetion-range-ns\' field from query result."); + goto error; + } + + intersection_begin = bt_value_map_get(intersection_range, + "begin"); + if (!intersection_begin) { + ret = -1; + BT_LOGD_STR("Cannot retrieve intersection-range-ns \'begin\' field from query result."); + goto error; + } + + intersection_end = bt_value_map_get(intersection_range, + "end"); + if (!intersection_end) { + ret = -1; + BT_LOGD_STR("Cannot retrieve intersection-range-ns \'end\' field from query result."); + goto error; + } + + value_status = bt_value_integer_get(intersection_begin, &begin); + if (value_status != BT_VALUE_STATUS_OK) { + ret = -1; + BT_LOGD_STR("Cannot retrieve value of intersection-range-ns \'begin\' field from query result."); + goto error; + } + + value_status = bt_value_integer_get(intersection_end, &end); + if (value_status != BT_VALUE_STATUS_OK) { + ret = -1; + BT_LOGD_STR("Cannot retrieve value of intersection-range-ns \'end\' field from query result."); + goto error; + } + + if (begin < 0 || end < 0 || end < begin) { + BT_LOGW("Invalid trace stream intersection values: " + "intersection-range-ns:begin=%" PRId64 + ", intersection-range-ns:end=%" PRId64, + begin, end); + ret = -1; + goto error; + } + + stream_infos = bt_value_map_get(trace_info, "streams"); + if (!stream_infos || !bt_value_is_array(stream_infos)) { + ret = -1; + BT_LOGD_STR("Cannot retrieve stream information from trace in query result."); + goto error; + } + + stream_count = bt_value_array_size(stream_infos); + if (stream_count < 0) { + ret = -1; + goto error; + } + + /* + * FIXME + * + * The first path of a stream's "paths" is currently used to + * associate streams/ports to a given trace intersection. + * + * This is a fragile hack as it relies on the port names + * being set to the various streams path. + * + * A stream name should be introduced as part of the trace-info + * query result. + */ + for (stream_idx = 0; stream_idx < stream_count; stream_idx++) { + const char *stream_path; + + port_id = g_new0(struct port_id, 1); + if (!port_id) { + ret = -1; + BT_LOGE_STR("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."); + 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."); + goto error; + } + trace_range->intersection_range_begin_ns = begin; + trace_range->intersection_range_end_ns = end; + + stream_info = bt_value_array_get(stream_infos, + stream_idx); + if (!stream_info || !bt_value_is_map(stream_info)) { + ret = -1; + BT_LOGD_STR("Cannot retrieve stream informations from trace in query result."); + goto error; + } + + stream_paths = bt_value_map_get(stream_info, "paths"); + if (!stream_paths || !bt_value_is_array(stream_paths)) { + ret = -1; + BT_LOGD_STR("Cannot retrieve stream paths from trace in query result."); + goto error; + } + + stream_path_value = bt_value_array_get(stream_paths, 0); + if (!stream_path_value || + !bt_value_is_string(stream_path_value)) { + ret = -1; + BT_LOGD_STR("Cannot retrieve stream path value from trace in query result."); + goto error; + } + + value_status = bt_value_string_get(stream_path_value, + &stream_path); + if (value_status != BT_VALUE_STATUS_OK) { + ret = -1; + goto error; + } + + port_id->port_name = strdup(stream_path); + if (!port_id->port_name) { + ret = -1; + BT_LOGE_STR("Cannot allocate memory for port_id port_name."); + goto error; + } + + BT_LOGD("Inserting stream intersection "); + + g_hash_table_insert(ctx->intersections, port_id, trace_range); + + port_id = NULL; + trace_range = NULL; + BT_PUT(stream_info); + BT_PUT(stream_paths); + BT_PUT(stream_path_value); + } + + BT_PUT(trace_info); + BT_PUT(stream_paths); + BT_PUT(stream_path_value); + BT_PUT(intersection_range); + BT_PUT(intersection_begin); + BT_PUT(intersection_end); + BT_PUT(stream_paths); + BT_PUT(stream_path_value); + } + + 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()); +end: + bt_put(component_path_value); + bt_put(query_params); + bt_put(query_result); + bt_put(trace_info); + bt_put(intersection_range); + bt_put(intersection_begin); + bt_put(intersection_end); + bt_put(stream_infos); + bt_put(stream_info); + bt_put(stream_paths); + bt_put(stream_path_value); + g_free(port_id); + g_free(trace_range); + return ret; +} + static int cmd_run_ctx_create_components_from_config_components( struct cmd_run_ctx *ctx, GPtrArray *cfg_components) @@ -1564,9 +2400,9 @@ int cmd_run_ctx_create_components_from_config_components( goto error; } - comp = bt_component_create(comp_cls, - cfg_comp->instance_name->str, cfg_comp->params); - if (!comp) { + ret = bt_graph_add_component(ctx->graph, comp_cls, + cfg_comp->instance_name->str, cfg_comp->params, &comp); + if (ret) { BT_LOGE("Cannot create component: plugin-name=\"%s\", " "comp-cls-name=\"%s\", comp-cls-type=%d, " "comp-name=\"%s\"", @@ -1581,12 +2417,20 @@ int cmd_run_ctx_create_components_from_config_components( goto error; } + if (ctx->stream_intersection_mode && + cfg_comp->type == BT_COMPONENT_CLASS_TYPE_SOURCE) { + ret = set_stream_intersections(ctx, cfg_comp, comp_cls); + if (ret) { + 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); + GUINT_TO_POINTER(quark), comp); comp = NULL; BT_PUT(comp_cls); } @@ -1679,16 +2523,25 @@ int cmd_run_ctx_connect_ports(struct cmd_run_ctx *ctx) g_hash_table_iter_init(&iter, ctx->components); while (g_hash_table_iter_next(&iter, &g_name_quark, &g_comp)) { + int64_t (*port_count_fn)(struct bt_component *); + struct bt_port *(*port_by_index_fn)(struct bt_component *, uint64_t); + 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); + port_count_fn = + bt_component_source_get_output_port_count; + port_by_index_fn = + 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); + port_count_fn = + bt_component_filter_get_output_port_count; + port_by_index_fn = + bt_component_filter_get_output_port_by_index; + } else { + continue; } + ret = cmd_run_ctx_connect_comp_ports(ctx, + g_comp, port_count_fn, port_by_index_fn); if (ret) { goto end; } @@ -1710,8 +2563,6 @@ const char *bt_graph_status_str(enum bt_graph_status status) return "BT_GRAPH_STATUS_END"; case BT_GRAPH_STATUS_OK: return "BT_GRAPH_STATUS_OK"; - case BT_GRAPH_STATUS_ALREADY_IN_A_GRAPH: - return "BT_GRAPH_STATUS_ALREADY_IN_A_GRAPH"; case BT_GRAPH_STATUS_INVALID: return "BT_GRAPH_STATUS_INVALID"; case BT_GRAPH_STATUS_NO_SINK: @@ -1860,44 +2711,134 @@ 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; + bt_cli_log_level = bt_log_get_level_from_env(ENV_BABELTRACE_CLI_LOG_LEVEL); } -void set_sigint_handler(void) +static +void set_auto_log_levels(struct bt_config *cfg) { - struct sigaction new_action, old_action; + const char **env_var_name; - new_action.sa_handler = sigint_handler; - sigemptyset(&new_action.sa_mask); - new_action.sa_flags = 0; - sigaction(SIGINT, NULL, &old_action); + /* + * Override the configuration's default log level if + * BABELTRACE_VERBOSE or BABELTRACE_DEBUG environment variables + * are found for backward compatibility with legacy Babetrace 1. + */ + if (getenv("BABELTRACE_DEBUG") && + strcmp(getenv("BABELTRACE_DEBUG"), "1") == 0) { + cfg->log_level = 'V'; + } else if (getenv("BABELTRACE_VERBOSE") && + strcmp(getenv("BABELTRACE_VERBOSE"), "1") == 0) { + cfg->log_level = 'I'; + } - if (old_action.sa_handler != SIG_IGN) { - sigaction(SIGINT, &new_action, NULL); + /* + * Set log levels according to --debug or --verbose. For + * backward compatibility, --debug is more verbose than + * --verbose. So: + * + * --verbose: INFO log level + * --debug: VERBOSE log level (includes DEBUG, which is + * is less verbose than VERBOSE in the internal + * logging framework) + */ + if (!getenv("BABELTRACE_LOGGING_GLOBAL_LEVEL")) { + if (cfg->verbose) { + bt_logging_set_global_level(BT_LOGGING_LEVEL_INFO); + } else if (cfg->debug) { + bt_logging_set_global_level(BT_LOGGING_LEVEL_VERBOSE); + } else { + /* + * Set library's default log level if not + * explicitly specified. + */ + switch (cfg->log_level) { + case 'N': + bt_logging_set_global_level(BT_LOGGING_LEVEL_NONE); + break; + case 'V': + bt_logging_set_global_level(BT_LOGGING_LEVEL_VERBOSE); + break; + case 'D': + bt_logging_set_global_level(BT_LOGGING_LEVEL_DEBUG); + break; + case 'I': + bt_logging_set_global_level(BT_LOGGING_LEVEL_INFO); + break; + case 'W': + bt_logging_set_global_level(BT_LOGGING_LEVEL_WARN); + break; + case 'E': + bt_logging_set_global_level(BT_LOGGING_LEVEL_ERROR); + break; + case 'F': + bt_logging_set_global_level(BT_LOGGING_LEVEL_FATAL); + break; + default: + abort(); + } + } + } + + if (!getenv(ENV_BABELTRACE_CLI_LOG_LEVEL)) { + if (cfg->verbose) { + bt_cli_log_level = BT_LOG_INFO; + } else if (cfg->debug) { + bt_cli_log_level = BT_LOG_VERBOSE; + } else { + /* + * Set CLI's default log level if not explicitly + * specified. + */ + switch (cfg->log_level) { + case 'N': + bt_cli_log_level = BT_LOG_NONE; + break; + case 'V': + bt_cli_log_level = BT_LOG_VERBOSE; + break; + case 'D': + bt_cli_log_level = BT_LOG_DEBUG; + break; + case 'I': + bt_cli_log_level = BT_LOG_INFO; + break; + case 'W': + bt_cli_log_level = BT_LOG_WARN; + break; + case 'E': + bt_cli_log_level = BT_LOG_ERROR; + break; + case 'F': + bt_cli_log_level = BT_LOG_FATAL; + break; + default: + abort(); + } + } + } + + env_var_name = log_level_env_var_names; + + while (*env_var_name) { + if (!getenv(*env_var_name)) { + if (cfg->verbose) { + g_setenv(*env_var_name, "I", 1); + } else if (cfg->debug) { + g_setenv(*env_var_name, "V", 1); + } else { + char val[2] = { 0 }; + + /* + * Set module's default log level if not + * explicitly specified. + */ + val[0] = cfg->log_level; + g_setenv(*env_var_name, val, 1); + } + } + + env_var_name++; } } @@ -1908,7 +2849,7 @@ int main(int argc, const char **argv) struct bt_config *cfg; init_log_level(); - set_sigint_handler(); + set_signal_handler(); init_static_data(); cfg = bt_config_cli_args_create_with_default(argc, argv, &retcode); @@ -1931,22 +2872,7 @@ int main(int argc, const char **argv) 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; + set_auto_log_levels(cfg); print_cfg(cfg); if (cfg->command_needs_plugins) {