X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2Fbabeltrace.c;h=a9d9f003d466feb3e49f93c6f515e2a9736475b6;hb=1974687e6b7a08d8383a4a5c75265d0ed3b8c5c9;hp=123df7f3a1fef3b8590dfb68723335b5fd579f62;hpb=e12720c0c6cd0b7e735830b458e04e13b95f9492;p=babeltrace.git

diff --git a/cli/babeltrace.c b/cli/babeltrace.c
index 123df7f3..a9d9f003 100644
--- a/cli/babeltrace.c
+++ b/cli/babeltrace.c
@@ -26,6 +26,9 @@
  * SOFTWARE.
  */
 
+#define BT_LOG_TAG "CLI"
+#include "logging.h"
+
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/plugin/plugin.h>
 #include <babeltrace/common-internal.h>
@@ -54,10 +57,28 @@
 #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_PLUGIN_CTF_BTR_LOG_LEVEL",
+	"BABELTRACE_PLUGIN_CTF_FS_SRC_LOG_LEVEL",
+	"BABELTRACE_PLUGIN_CTF_LTTNG_LIVE_SRC_LOG_LEVEL",
+	"BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL",
+	"BABELTRACE_PLUGIN_CTF_NOTIF_ITER_LOG_LEVEL",
+	"BABELTRACE_PLUGIN_LTTNG_UTILS_DEBUG_INFO_FLT_LOG_LEVEL",
+	"BABELTRACE_PLUGIN_TEXT_DMESG_SRC_LOG_LEVEL",
+	"BABELTRACE_PLUGIN_UTILS_MUXER_FLT_LOG_LEVEL",
+	"BABELTRACE_PLUGIN_UTILS_TRIMMER_FLT_LOG_LEVEL",
+	"BABELTRACE_PYTHON_PLUGIN_PROVIDER_LOG_LEVEL",
+	NULL,
+};
 
 /* Application's processing graph (weak) */
 static struct bt_graph *the_graph;
@@ -65,9 +86,6 @@ static bool canceled = false;
 
 GPtrArray *loaded_plugins;
 
-BT_HIDDEN
-int bt_cli_log_level = BT_LOG_NONE;
-
 static
 void sigint_handler(int signum)
 {
@@ -181,7 +199,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 +220,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(),
@@ -366,7 +382,7 @@ void print_value_rec(FILE *fp, struct bt_value *value, size_t indent)
 		break;
 	}
 	default:
-		assert(false);
+		abort();
 	}
 }
 
@@ -519,7 +535,7 @@ void print_cfg(struct bt_config *cfg)
 		print_cfg_print_lttng_live_sessions(cfg);
 		break;
 	default:
-		assert(false);
+		abort();
 	}
 }
 
@@ -581,6 +597,19 @@ int load_dynamic_plugins(struct bt_value *plugin_paths)
 		plugin_path_value = bt_value_array_get(plugin_paths, i);
 		bt_value_string_get(plugin_path_value, &plugin_path);
 		assert(plugin_path);
+
+		/*
+		 * 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\"",
@@ -934,8 +963,135 @@ end:
 static
 int cmd_print_lttng_live_sessions(struct bt_config *cfg)
 {
-	printf("TODO\n");
-	return -1;
+	int ret = 0;
+	struct bt_component_class *comp_cls = NULL;
+	struct bt_value *results = NULL;
+	struct bt_value *params = NULL;
+	struct bt_value *map = NULL;
+	struct bt_value *v = NULL;
+	static const char * const plugin_name = "ctf";
+	static const char * const comp_cls_name = "lttng-live";
+	static const enum bt_component_class_type comp_cls_type =
+		BT_COMPONENT_CLASS_TYPE_SOURCE;
+	int64_t array_size, i;
+
+	assert(cfg->cmd_data.print_lttng_live_sessions.url);
+	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(),
+			bt_common_color_reset());
+		print_plugin_comp_cls_opt(stderr, plugin_name,
+			comp_cls_name, comp_cls_type);
+		fprintf(stderr, "\n");
+		goto error;
+	}
+
+	params = bt_value_map_create();
+	if (!params) {
+		goto error;
+	}
+
+	ret = bt_value_map_insert_string(params, "url",
+		cfg->cmd_data.print_lttng_live_sessions.url->str);
+	if (ret) {
+		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;
+	}
+
+	if (!bt_value_is_array(results)) {
+		BT_LOGE_STR("Expecting an array for sessions query.");
+		fprintf(stderr, "%s%sUnexpected type returned by session query%s\n",
+			bt_common_color_bold(),
+			bt_common_color_fg_red(),
+			bt_common_color_reset());
+		goto error;
+	}
+
+	array_size = bt_value_array_size(results);
+	for (i = 0; i < array_size; i++) {
+		const char *url_text;
+		int64_t timer_us, streams, clients;
+
+		map = bt_value_array_get(results, i);
+		if (!map) {
+			BT_LOGE_STR("Unexpected empty array entry.");
+			goto error;
+		}
+		if (!bt_value_is_map(map)) {
+			BT_LOGE_STR("Unexpected entry type.");
+			goto error;
+		}
+
+		v = bt_value_map_get(map, "url");
+		if (!v) {
+			BT_LOGE_STR("Unexpected empty array \"url\" entry.");
+			goto error;
+		}
+		ret = bt_value_string_get(v, &url_text);
+		assert(ret == 0);
+		printf("%s", url_text);
+		BT_PUT(v);
+
+		v = bt_value_map_get(map, "timer-us");
+		if (!v) {
+			BT_LOGE_STR("Unexpected empty array \"timer-us\" entry.");
+			goto error;
+		}
+		ret = bt_value_integer_get(v, &timer_us);
+		assert(ret == 0);
+		printf(" (timer = %" PRIu64 ", ", timer_us);
+		BT_PUT(v);
+
+		v = bt_value_map_get(map, "stream-count");
+		if (!v) {
+			BT_LOGE_STR("Unexpected empty array \"stream-count\" entry.");
+			goto error;
+		}
+		ret = bt_value_integer_get(v, &streams);
+		assert(ret == 0);
+		printf("%" PRIu64 " stream(s), ", streams);
+		BT_PUT(v);
+
+		v = bt_value_map_get(map, "client-count");
+		if (!v) {
+			BT_LOGE_STR("Unexpected empty array \"client-count\" entry.");
+			goto error;
+		}
+		ret = bt_value_integer_get(v, &clients);
+		assert(ret == 0);
+		printf("%" PRIu64 " client(s) connected)\n", clients);
+		BT_PUT(v);
+
+		BT_PUT(map);
+	}
+end:
+	bt_put(v);
+	bt_put(map);
+	bt_put(results);
+	bt_put(params);
+	bt_put(comp_cls);
+	return 0;
+
+error:
+	ret = -1;
+	goto end;
 }
 
 static
@@ -1015,6 +1171,53 @@ end:
 	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;
@@ -1026,8 +1229,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,
@@ -1041,7 +1296,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\", "
@@ -1053,7 +1368,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,
@@ -1076,7 +1391,7 @@ int cmd_run_ctx_connect_upstream_port_to_downstream_component(
 		 */
 		BT_LOGF("Invalid connection: downstream component is a source: "
 			"conn-arg=\"%s\"", cfg_conn->arg->str);
-		assert(false);
+		abort();
 	}
 
 	downstream_port_count = port_count_fn(downstream_comp);
@@ -1085,11 +1400,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: "
@@ -1101,35 +1417,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\", "
@@ -1140,14 +1510,61 @@ 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);
+		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);
+
+		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;
+		}
+		goto end;
 	}
 
-	if (!conn) {
+	if (status != BT_GRAPH_STATUS_OK) {
 		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\"",
@@ -1166,7 +1583,13 @@ 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;
 }
 
@@ -1206,29 +1629,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: "
@@ -1257,6 +1682,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;
@@ -1341,6 +1771,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;
@@ -1359,6 +1794,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;
@@ -1367,25 +1811,29 @@ 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);
-	if (ret) {
+	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);
-	if (ret) {
+	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);
-	if (ret) {
+	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);
-	if (ret) {
+	if (ret < 0) {
+		BT_LOGE_STR("Cannot add \"ports disconnected\" listener to graph.");
 		goto error;
 	}
 
@@ -1399,6 +1847,275 @@ 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;
+
+	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 paramater map.");
+		ret = -1;
+		goto error;
+	}
+
+	query_result = bt_component_class_query(comp_cls, "trace-info",
+		query_params);
+	if (!query_result) {
+		BT_LOGD("Component class \'%s\' does not support the \'trace-info\' query.",
+			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 informations 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)
@@ -1433,11 +2150,11 @@ 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-cls-name=\"%s\", comp-cls-type=%d, "
 				"comp-name=\"%s\"",
 				cfg_comp->plugin_name->str,
 				cfg_comp->comp_cls_name->str,
@@ -1450,12 +2167,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);
 	}
@@ -1548,16 +2273,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;
 		}
@@ -1579,8 +2313,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:
@@ -1605,6 +2337,13 @@ int cmd_run(struct bt_config *cfg)
 		goto error;
 	}
 
+	if (canceled) {
+		BT_LOGI_STR("Canceled by user before creating components.");
+		goto error;
+	}
+
+	BT_LOGI_STR("Creating components.");
+
 	/* Create the requested component instances */
 	if (cmd_run_ctx_create_components(&ctx)) {
 		BT_LOGE_STR("Cannot create components.");
@@ -1612,6 +2351,13 @@ int cmd_run(struct bt_config *cfg)
 		goto error;
 	}
 
+	if (canceled) {
+		BT_LOGI_STR("Canceled by user before connecting components.");
+		goto error;
+	}
+
+	BT_LOGI_STR("Connecting components.");
+
 	/* Connect the initially visible component ports */
 	if (cmd_run_ctx_connect_ports(&ctx)) {
 		BT_LOGE_STR("Cannot connect initial component ports.");
@@ -1620,7 +2366,8 @@ int cmd_run(struct bt_config *cfg)
 	}
 
 	if (canceled) {
-		goto end;
+		BT_LOGI_STR("Canceled by user before running the graph.");
+		goto error;
 	}
 
 	BT_LOGI_STR("Running the graph.");
@@ -1629,6 +2376,13 @@ int cmd_run(struct bt_config *cfg)
 	while (true) {
 		enum bt_graph_status graph_status = bt_graph_run(ctx.graph);
 
+		/*
+		 * Reset console in case something messed with console
+		 * codes during the graph's execution.
+		 */
+		printf("%s", bt_common_color_reset());
+		fflush(stdout);
+		fprintf(stderr, "%s", bt_common_color_reset());
 		BT_LOGV("bt_graph_run() returned: status=%s",
 			bt_graph_status_str(graph_status));
 
@@ -1707,33 +2461,138 @@ 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);
+}
+
+static
+void set_auto_log_levels(struct bt_config *cfg)
+{
+	const char **env_var_name;
+
+	/*
+	 * 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';
+	}
+
+	/*
+	 * 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++;
+	}
 }
 
+static
 void set_sigint_handler(void)
 {
 	struct sigaction new_action, old_action;
@@ -1778,22 +2637,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) {
@@ -1828,8 +2672,8 @@ 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);
+		BT_LOGF("Invalid/unknown command: cmd=%d", cfg->command);
+		abort();
 	}
 
 	BT_LOGI("Command completed: cmd=%d, command-name=\"%s\", ret=%d",