X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2Fbabeltrace-cfg-cli-args.c;h=06385a35d1e908edfd3b0c9bd0870894ecdf6210;hb=1e20174de25333862f77d17151525224afbb0662;hp=f501ebcdcf26db8811e00a35c3b5bf2e8d3aa138;hpb=d5128b09594b58082759e74504ece9f7d0cb5482;p=babeltrace.git

diff --git a/cli/babeltrace-cfg-cli-args.c b/cli/babeltrace-cfg-cli-args.c
index f501ebcd..06385a35 100644
--- a/cli/babeltrace-cfg-cli-args.c
+++ b/cli/babeltrace-cfg-cli-args.c
@@ -70,9 +70,6 @@ enum ini_parsing_fsm_state {
 	/* Expect a value */
 	INI_EXPECT_VALUE,
 
-	/* Expect a negative number value */
-	INI_EXPECT_VALUE_NUMBER_NEG,
-
 	/* Expect a comma character (',') */
 	INI_EXPECT_COMMA,
 };
@@ -188,6 +185,196 @@ void ini_append_error_expecting(struct ini_parsing_state *state,
 	g_string_append_printf(state->ini_error, "^\n\n");
 }
 
+/* Parse the next token as a number and return its negation. */
+static
+bt_value *ini_parse_neg_number(struct ini_parsing_state *state)
+{
+	bt_value *value = NULL;
+	GTokenType token_type = g_scanner_get_next_token(state->scanner);
+
+	switch (token_type) {
+	case G_TOKEN_INT:
+	{
+		/* Negative integer */
+		uint64_t int_val = state->scanner->value.v_int64;
+
+		if (int_val > (((uint64_t) INT64_MAX) + 1)) {
+			g_string_append_printf(state->ini_error,
+				"Integer value -%" PRIu64 " is outside the range of a 64-bit signed integer\n",
+				int_val);
+		} else {
+			value = bt_value_integer_create_init(-((int64_t) int_val));
+		}
+
+		break;
+	}
+	case G_TOKEN_FLOAT:
+		/* Negative floating point number */
+		value = bt_value_real_create_init(-state->scanner->value.v_float);
+		break;
+	default:
+		ini_append_error_expecting(state, state->scanner, "value");
+		break;
+	}
+
+	return value;
+}
+
+static bt_value *ini_parse_value(struct ini_parsing_state *state);
+
+/*
+ * Parse the current and following tokens as an array.  Arrays are formatted as
+ * an opening `[`, a list of comma-separated values and a closing `]`.  For
+ * convenience we support an optional trailing comma, after the last value.
+ *
+ * The current token of the parser must be the opening square bracket of the
+ * array.
+ */
+static
+bt_value *ini_parse_array(struct ini_parsing_state *state)
+{
+	/* The [ character must have already been ingested. */
+	BT_ASSERT(g_scanner_cur_token(state->scanner) == G_TOKEN_CHAR);
+	BT_ASSERT(g_scanner_cur_value(state->scanner).v_char == '[');
+
+	bt_value *array_value;
+	GTokenType token_type;
+
+	array_value = bt_value_array_create ();
+	token_type = g_scanner_get_next_token(state->scanner);
+
+	/* While the current token is not a ]... */
+	while (!(token_type == G_TOKEN_CHAR && g_scanner_cur_value(state->scanner).v_char == ']')) {
+		/* Parse the item... */
+		bt_value *item_value;
+		bt_value_status status;
+
+		item_value = ini_parse_value(state);
+		if (!item_value) {
+			goto error;
+		}
+
+		/* ... and add it to the result array. */
+		status = bt_value_array_append_element(array_value, item_value);
+		BT_VALUE_PUT_REF_AND_RESET(item_value);
+
+		if (status != BT_VALUE_STATUS_OK) {
+			goto error;
+		}
+
+		/*
+		 * Ingest the token following the value, it should be either a
+		 * comma or closing square brace.
+		 */
+		token_type = g_scanner_get_next_token(state->scanner);
+
+		if (token_type == G_TOKEN_CHAR && g_scanner_cur_value(state->scanner).v_char == ',') {
+			/*
+			 * Ingest the token following the comma.  If it happens
+			 * to be a closing square bracket, we'll exit the loop
+			 * and we are done (we allow trailing commas).
+			 * Otherwise, we are ready for the next ini_parse_value call.
+			 */
+			token_type = g_scanner_get_next_token(state->scanner);
+		} else if (token_type != G_TOKEN_CHAR || g_scanner_cur_value(state->scanner).v_char != ']') {
+			ini_append_error_expecting(state, state->scanner, ", or ]");
+			goto error;
+		}
+	}
+
+	goto end;
+
+error:
+	BT_VALUE_PUT_REF_AND_RESET(array_value);
+
+end:
+	return array_value;
+}
+
+/*
+ * Parse the current token (and the following ones if needed) as a value, return
+ * it as a bt_value.
+ */
+static
+bt_value *ini_parse_value(struct ini_parsing_state *state)
+{
+	bt_value *value = NULL;
+	GTokenType token_type = state->scanner->token;
+
+	switch (token_type) {
+	case G_TOKEN_CHAR:
+		if (state->scanner->value.v_char == '-') {
+			/* Negative number */
+			value = ini_parse_neg_number(state);
+		} else if (state->scanner->value.v_char == '[') {
+			/* Array */
+			value = ini_parse_array(state);
+		} else {
+			ini_append_error_expecting(state, state->scanner, "value");
+		}
+		break;
+	case G_TOKEN_INT:
+	{
+		/* Positive integer */
+		uint64_t int_val = state->scanner->value.v_int64;
+
+		if (int_val > INT64_MAX) {
+			g_string_append_printf(state->ini_error,
+				"Integer value %" PRIu64 " is outside the range of a 64-bit signed integer\n",
+				int_val);
+		} else {
+			value = bt_value_integer_create_init((int64_t)int_val);
+		}
+		break;
+	}
+	case G_TOKEN_FLOAT:
+		/* Positive floating point number */
+		value = bt_value_real_create_init(state->scanner->value.v_float);
+		break;
+	case G_TOKEN_STRING:
+		/* Quoted string */
+		value = bt_value_string_create_init(state->scanner->value.v_string);
+		break;
+	case G_TOKEN_IDENTIFIER:
+	{
+		/*
+		 * Using symbols would be appropriate here,
+		 * but said symbols are allowed as map key,
+		 * so it's easier to consider everything an
+		 * identifier.
+		 *
+		 * If one of the known symbols is not
+		 * recognized here, then fall back to creating
+		 * a string value.
+		 */
+		const char *id = state->scanner->value.v_identifier;
+
+		if (!strcmp(id, "null") || !strcmp(id, "NULL") ||
+				!strcmp(id, "nul")) {
+			value = bt_value_null;
+		} else if (!strcmp(id, "true") || !strcmp(id, "TRUE") ||
+				!strcmp(id, "yes") ||
+				!strcmp(id, "YES")) {
+			value = bt_value_bool_create_init(true);
+		} else if (!strcmp(id, "false") ||
+				!strcmp(id, "FALSE") ||
+				!strcmp(id, "no") ||
+				!strcmp(id, "NO")) {
+			value = bt_value_bool_create_init(false);
+		} else {
+			value = bt_value_string_create_init(id);
+		}
+		break;
+	}
+	default:
+		/* Unset value variable will trigger the error */
+		ini_append_error_expecting(state, state->scanner, "value");
+		break;
+	}
+
+	return value;
+}
+
 static
 int ini_handle_state(struct ini_parsing_state *state)
 {
@@ -204,7 +391,6 @@ int ini_handle_state(struct ini_parsing_state *state)
 					state->scanner, "'='");
 				break;
 			case INI_EXPECT_VALUE:
-			case INI_EXPECT_VALUE_NUMBER_NEG:
 				ini_append_error_expecting(state,
 					state->scanner, "value");
 				break;
@@ -267,117 +453,8 @@ int ini_handle_state(struct ini_parsing_state *state)
 		goto success;
 	case INI_EXPECT_VALUE:
 	{
-		switch (token_type) {
-		case G_TOKEN_CHAR:
-			if (state->scanner->value.v_char == '-') {
-				/* Negative number */
-				state->expecting =
-					INI_EXPECT_VALUE_NUMBER_NEG;
-				goto success;
-			} else {
-				ini_append_error_expecting(state,
-					state->scanner, "value");
-				goto error;
-			}
-			break;
-		case G_TOKEN_INT:
-		{
-			/* Positive integer */
-			uint64_t int_val = state->scanner->value.v_int64;
-
-			if (int_val > (1ULL << 63) - 1) {
-				g_string_append_printf(state->ini_error,
-					"Integer value %" PRIu64 " is outside the range of a 64-bit signed integer\n",
-					int_val);
-				goto error;
-			}
-
-			value = bt_value_integer_create_init((int64_t)int_val);
-			break;
-		}
-		case G_TOKEN_FLOAT:
-			/* Positive floating point number */
-			value = bt_value_real_create_init(state->scanner->value.v_float);
-			break;
-		case G_TOKEN_STRING:
-			/* Quoted string */
-			value = bt_value_string_create_init(state->scanner->value.v_string);
-			break;
-		case G_TOKEN_IDENTIFIER:
-		{
-			/*
-			 * Using symbols would be appropriate here,
-			 * but said symbols are allowed as map key,
-			 * so it's easier to consider everything an
-			 * identifier.
-			 *
-			 * If one of the known symbols is not
-			 * recognized here, then fall back to creating
-			 * a string value.
-			 */
-			const char *id = state->scanner->value.v_identifier;
-
-			if (!strcmp(id, "null") || !strcmp(id, "NULL") ||
-					!strcmp(id, "nul")) {
-				value = bt_value_null;
-			} else if (!strcmp(id, "true") || !strcmp(id, "TRUE") ||
-					!strcmp(id, "yes") ||
-					!strcmp(id, "YES")) {
-				value = bt_value_bool_create_init(true);
-			} else if (!strcmp(id, "false") ||
-					!strcmp(id, "FALSE") ||
-					!strcmp(id, "no") ||
-					!strcmp(id, "NO")) {
-				value = bt_value_bool_create_init(false);
-			} else {
-				value = bt_value_string_create_init(id);
-			}
-			break;
-		}
-		default:
-			/* Unset value variable will trigger the error */
-			break;
-		}
-
-		if (!value) {
-			ini_append_error_expecting(state,
-				state->scanner, "value");
-			goto error;
-		}
-
-		state->expecting = INI_EXPECT_COMMA;
-		goto success;
-	}
-	case INI_EXPECT_VALUE_NUMBER_NEG:
-	{
-		switch (token_type) {
-		case G_TOKEN_INT:
-		{
-			/* Negative integer */
-			uint64_t int_val = state->scanner->value.v_int64;
-
-			if (int_val > (1ULL << 63) - 1) {
-				g_string_append_printf(state->ini_error,
-					"Integer value -%" PRIu64 " is outside the range of a 64-bit signed integer\n",
-					int_val);
-				goto error;
-			}
-
-			value = bt_value_integer_create_init(-((int64_t)int_val));
-			break;
-		}
-		case G_TOKEN_FLOAT:
-			/* Negative floating point number */
-			value = bt_value_real_create_init(-state->scanner->value.v_float);
-			break;
-		default:
-			/* Unset value variable will trigger the error */
-			break;
-		}
-
+		value = ini_parse_value(state);
 		if (!value) {
-			ini_append_error_expecting(state,
-				state->scanner, "value");
 			goto error;
 		}
 
@@ -1319,7 +1396,6 @@ enum {
 	OPT_FIELDS,
 	OPT_HELP,
 	OPT_INPUT_FORMAT,
-	OPT_KEY,
 	OPT_LIST,
 	OPT_NAME,
 	OPT_NAMES,
@@ -1338,7 +1414,6 @@ enum {
 	OPT_STREAM_INTERSECTION,
 	OPT_TIMERANGE,
 	OPT_URL,
-	OPT_VALUE,
 	OPT_VERBOSE,
 };
 
@@ -1766,6 +1841,8 @@ void print_expected_params_format(FILE *fp)
 	fprintf(fp, "* Unquoted string with no special characters, and not matching any of\n");
 	fprintf(fp, "  the null and boolean value symbols above.\n");
 	fprintf(fp, "* Double-quoted string (accepts escape characters).\n");
+	fprintf(fp, "* Array, formatted as an opening `[`, a list of comma-separated values\n");
+	fprintf(fp, "  (as described by the current list) and a closing `]`.\n");
 	fprintf(fp, "\n");
 	fprintf(fp, "You can put whitespaces allowed around individual `=` and `,` symbols.\n");
 	fprintf(fp, "\n");
@@ -1773,7 +1850,8 @@ void print_expected_params_format(FILE *fp)
 	fprintf(fp, "\n");
 	fprintf(fp, "    many=null, fresh=yes, condition=false, squirrel=-782329,\n");
 	fprintf(fp, "    observe=3.14, simple=beef, needs-quotes=\"some string\",\n");
-	fprintf(fp, "    escape.chars-are:allowed=\"this is a \\\" double quote\"\n");
+	fprintf(fp, "    escape.chars-are:allowed=\"this is a \\\" double quote\",\n");
+	fprintf(fp, "    things=[1, \"2\", 3]\n");
 	fprintf(fp, "\n");
 	fprintf(fp, "IMPORTANT: Make sure to single-quote the whole argument when you run\n");
 	fprintf(fp, "babeltrace from a shell.\n");
@@ -1993,7 +2071,10 @@ struct bt_config *bt_config_query_from_args(int argc, const char *argv[],
 	int ret;
 	struct bt_config *cfg = NULL;
 	const char *leftover;
-	bt_value *params = bt_value_null;
+	bt_value *params;
+
+	params = bt_value_null;
+	bt_value_get_ref(bt_value_null);
 
 	*retcode = 0;
 	cfg = bt_config_query_create(initial_plugin_paths);
@@ -2291,8 +2372,6 @@ void print_run_usage(FILE *fp)
 	fprintf(fp, "                                    specify the name with --name)\n");
 	fprintf(fp, "  -x, --connect=CONNECTION          Connect two created components (see the\n");
 	fprintf(fp, "                                    expected format of CONNECTION below)\n");
-	fprintf(fp, "      --key=KEY                     Set the current initialization string\n");
-	fprintf(fp, "                                    parameter key to KEY (see --value)\n");
 	fprintf(fp, "  -n, --name=NAME                   Set the name of the current component\n");
 	fprintf(fp, "                                    to NAME (must be unique amongst all the\n");
 	fprintf(fp, "                                    names of the created components)\n");
@@ -2309,10 +2388,6 @@ void print_run_usage(FILE *fp)
 	fprintf(fp, "      --retry-duration=DUR          When babeltrace(1) needs to retry to run\n");
 	fprintf(fp, "                                    the graph later, retry in DUR µs\n");
 	fprintf(fp, "                                    (default: 100000)\n");
-	fprintf(fp, "      --value=VAL                   Add a string initialization parameter to\n");
-	fprintf(fp, "                                    the current component with a name given by\n");
-	fprintf(fp, "                                    the last argument of the --key option and a\n");
-	fprintf(fp, "                                    value set to VAL\n");
 	fprintf(fp, "  -h, --help                        Show this help and quit\n");
 	fprintf(fp, "\n");
 	fprintf(fp, "See `babeltrace --help` for the list of general options.\n");
@@ -2376,7 +2451,6 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 	struct bt_config *cfg = NULL;
 	bt_value *instance_names = NULL;
 	bt_value *connection_args = NULL;
-	GString *cur_param_key = NULL;
 	char error_buf[256] = { 0 };
 	long retry_duration = -1;
 	bt_value_status status;
@@ -2385,7 +2459,6 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 		{ "component", 'c', POPT_ARG_STRING, NULL, OPT_COMPONENT, NULL, NULL },
 		{ "connect", 'x', POPT_ARG_STRING, NULL, OPT_CONNECT, NULL, NULL },
 		{ "help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL },
-		{ "key", '\0', POPT_ARG_STRING, NULL, OPT_KEY, NULL, NULL },
 		{ "name", 'n', POPT_ARG_STRING, NULL, OPT_NAME, NULL, NULL },
 		{ "omit-home-plugin-path", '\0', POPT_ARG_NONE, NULL, OPT_OMIT_HOME_PLUGIN_PATH, NULL, NULL },
 		{ "omit-system-plugin-path", '\0', POPT_ARG_NONE, NULL, OPT_OMIT_SYSTEM_PLUGIN_PATH, NULL, NULL },
@@ -2393,16 +2466,10 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 		{ "plugin-path", '\0', POPT_ARG_STRING, NULL, OPT_PLUGIN_PATH, NULL, NULL },
 		{ "reset-base-params", 'r', POPT_ARG_NONE, NULL, OPT_RESET_BASE_PARAMS, NULL, NULL },
 		{ "retry-duration", '\0', POPT_ARG_LONG, &retry_duration, OPT_RETRY_DURATION, NULL, NULL },
-		{ "value", '\0', POPT_ARG_STRING, NULL, OPT_VALUE, NULL, NULL },
 		{ NULL, 0, '\0', NULL, 0, NULL, NULL },
 	};
 
 	*retcode = 0;
-	cur_param_key = g_string_new(NULL);
-	if (!cur_param_key) {
-		print_err_oom();
-		goto error;
-	}
 
 	if (argc <= 1) {
 		print_run_usage(stdout);
@@ -2544,33 +2611,6 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 			BT_OBJECT_MOVE_REF(cur_cfg_comp->params, params_to_set);
 			break;
 		}
-		case OPT_KEY:
-			if (strlen(arg) == 0) {
-				printf_err("Cannot set an empty string as the current parameter key\n");
-				goto error;
-			}
-
-			g_string_assign(cur_param_key, arg);
-			break;
-		case OPT_VALUE:
-			if (!cur_cfg_comp) {
-				printf_err("Cannot set a parameter's value of unavailable component:\n    %s\n",
-					arg);
-				goto error;
-			}
-
-			if (cur_param_key->len == 0) {
-				printf_err("--value option specified without preceding --key option:\n    %s\n",
-					arg);
-				goto error;
-			}
-
-			if (bt_value_map_insert_string_entry(cur_cfg_comp->params,
-					cur_param_key->str, arg)) {
-				print_err_oom();
-				goto error;
-			}
-			break;
 		case OPT_NAME:
 			if (!cur_cfg_comp) {
 				printf_err("Cannot set the name of unavailable component:\n    %s\n",
@@ -2690,10 +2730,6 @@ end:
 		poptFreeContext(pc);
 	}
 
-	if (cur_param_key) {
-		g_string_free(cur_param_key, TRUE);
-	}
-
 	free(arg);
 	BT_OBJECT_PUT_REF_AND_RESET(cur_cfg_comp);
 	BT_VALUE_PUT_REF_AND_RESET(cur_base_params);
@@ -3095,17 +3131,6 @@ void finalize_implicit_component_args(struct implicit_component_args *args)
 	bt_value_put_ref(args->extra_params);
 }
 
-static
-void destroy_implicit_component_args(void *args)
-{
-	if (!args) {
-		return;
-	}
-
-	finalize_implicit_component_args(args);
-	g_free(args);
-}
-
 static
 int init_implicit_component_args(struct implicit_component_args *args,
 		const char *comp_arg, bool exists)
@@ -3140,44 +3165,202 @@ void append_implicit_component_param(struct implicit_component_args *args,
 	append_param_arg(args->params_arg, key, value);
 }
 
+/* Escape value to make it suitable to use as a string parameter value. */
 static
-int append_implicit_component_extra_param(struct implicit_component_args *args,
-		const char *key, const char *value)
+gchar *escape_string_value(const char *value)
 {
-	int ret = 0;
+	GString *ret;
+	const char *in;
 
+	ret = g_string_new(NULL);
+	if (!ret) {
+		print_err_oom();
+		goto end;
+	}
+
+	in = value;
+	while (*in) {
+		switch (*in) {
+		case '"':
+		case '\\':
+			g_string_append_c(ret, '\\');
+			break;
+		}
+
+		g_string_append_c(ret, *in);
+
+		in++;
+	}
+
+end:
+	return g_string_free(ret, FALSE);
+}
+
+static
+int bt_value_to_cli_param_value_append(const bt_value *value, GString *buf)
+{
+	BT_ASSERT(buf);
+
+	int ret = -1;
+
+	switch (bt_value_get_type(value)) {
+	case BT_VALUE_TYPE_STRING:
+	{
+		const char *str_value = bt_value_string_get(value);
+		gchar *escaped_str_value;
+
+		escaped_str_value = escape_string_value(str_value);
+		if (!escaped_str_value) {
+			goto end;
+		}
+
+		g_string_append_printf(buf, "\"%s\"", escaped_str_value);
+
+		g_free(escaped_str_value);
+		break;
+	}
+	case BT_VALUE_TYPE_ARRAY: {
+		g_string_append_c(buf, '[');
+		uint64_t sz = bt_value_array_get_size(value);
+		for (uint64_t i = 0; i < sz; i++) {
+			if (i > 0) {
+				g_string_append_c(buf, ',');
+			}
+			const bt_value *item = bt_value_array_borrow_element_by_index_const(value, i);
+			int ret = bt_value_to_cli_param_value_append(item, buf);
+			if (ret) {
+				goto end;
+			}
+		}
+		g_string_append_c(buf, ']');
+		break;
+	}
+	default:
+		abort();
+	}
+
+	ret = 0;
+
+end:
+	return ret;
+}
+
+/*
+ * Convert `value` to its equivalent representation as a command line parameter
+ * value.
+ */
+
+static
+gchar *bt_value_to_cli_param_value(bt_value *value)
+{
+	GString *buf;
+	gchar *result = NULL;
+
+	buf = g_string_new(NULL);
+	if (!buf) {
+		print_err_oom();
+		goto error;
+	}
+
+	if (bt_value_to_cli_param_value_append(value, buf)) {
+		goto error;
+	}
+
+	result = g_string_free(buf, FALSE);
+	buf = NULL;
+
+	goto end;
+
+error:
+	if (buf) {
+		g_string_free(buf, TRUE);
+	}
+
+end:
+	return result;
+}
+
+static
+int append_parameter_to_args(bt_value *args, const char *key, bt_value *value)
+{
 	BT_ASSERT(args);
+	BT_ASSERT(bt_value_get_type(args) == BT_VALUE_TYPE_ARRAY);
 	BT_ASSERT(key);
 	BT_ASSERT(value);
 
-	if (bt_value_array_append_string_element(args->extra_params, "--key")) {
+	int ret = 0;
+	gchar *str_value = NULL;
+	GString *parameter = NULL;
+
+	if (bt_value_array_append_string_element(args, "--params")) {
 		print_err_oom();
 		ret = -1;
 		goto end;
 	}
 
-	if (bt_value_array_append_string_element(args->extra_params, key)) {
+	str_value = bt_value_to_cli_param_value(value);
+	if (!str_value) {
+		ret = -1;
+		goto end;
+	}
+
+	parameter = g_string_new(NULL);
+	if (!parameter) {
 		print_err_oom();
 		ret = -1;
 		goto end;
 	}
 
-	if (bt_value_array_append_string_element(args->extra_params, "--value")) {
+	g_string_printf(parameter, "%s=%s", key, str_value);
+
+	if (bt_value_array_append_string_element(args, parameter->str)) {
 		print_err_oom();
 		ret = -1;
 		goto end;
 	}
 
-	if (bt_value_array_append_string_element(args->extra_params, value)) {
+end:
+	if (parameter) {
+		g_string_free(parameter, TRUE);
+		parameter = NULL;
+	}
+
+	if (str_value) {
+		g_free(str_value);
+		str_value = NULL;
+	}
+
+	return ret;
+}
+
+static
+int append_string_parameter_to_args(bt_value *args, const char *key, const char *value)
+{
+	bt_value *str_value;
+	int ret;
+
+	str_value = bt_value_string_create_init(value);
+
+	if (!str_value) {
 		print_err_oom();
 		ret = -1;
 		goto end;
 	}
 
+	ret = append_parameter_to_args(args, key, str_value);
+
 end:
+	BT_VALUE_PUT_REF_AND_RESET(str_value);
 	return ret;
 }
 
+static
+int append_implicit_component_extra_param(struct implicit_component_args *args,
+		const char *key, const char *value)
+{
+	return append_string_parameter_to_args(args->extra_params, key, value);
+}
+
 static
 int convert_append_name_param(enum bt_config_component_dest dest,
 		GString *cur_name, GString *cur_name_prefix,
@@ -3491,85 +3674,6 @@ end:
 	return ret;
 }
 
-static
-struct implicit_component_args *create_implicit_component_args(void)
-{
-	struct implicit_component_args *impl_args =
-		g_new0(struct implicit_component_args, 1);
-
-	if (!impl_args) {
-		goto end;
-	}
-
-	if (init_implicit_component_args(impl_args, NULL, true)) {
-		destroy_implicit_component_args(impl_args);
-		impl_args = NULL;
-		goto end;
-	}
-
-end:
-	return impl_args;
-}
-
-static
-int fill_implicit_ctf_inputs_args(GPtrArray *implicit_ctf_inputs_args,
-		struct implicit_component_args *base_implicit_ctf_input_args,
-		GList *leftovers)
-{
-	int ret = 0;
-	GList *leftover;
-	bt_value_status status;
-
-	for (leftover = leftovers; leftover != NULL;
-			leftover = g_list_next(leftover)) {
-		GString *gs_leftover = leftover->data;
-		struct implicit_component_args *impl_args =
-			create_implicit_component_args();
-
-		if (!impl_args) {
-			print_err_oom();
-			goto error;
-		}
-
-		impl_args->exists = true;
-		g_string_assign(impl_args->comp_arg,
-			base_implicit_ctf_input_args->comp_arg->str);
-		g_string_assign(impl_args->params_arg,
-			base_implicit_ctf_input_args->params_arg->str);
-
-		/*
-		 * We need our own copy of the extra parameters because
-		 * this is where the unique path goes.
-		 */
-		BT_VALUE_PUT_REF_AND_RESET(impl_args->extra_params);
-		status = bt_value_copy(base_implicit_ctf_input_args->extra_params,
-			&impl_args->extra_params);
-		if (status != BT_VALUE_STATUS_OK) {
-			print_err_oom();
-			destroy_implicit_component_args(impl_args);
-			goto error;
-		}
-
-		/* Append unique path parameter */
-		ret = append_implicit_component_extra_param(impl_args,
-			"path", gs_leftover->str);
-		if (ret) {
-			destroy_implicit_component_args(impl_args);
-			goto error;
-		}
-
-		g_ptr_array_add(implicit_ctf_inputs_args, impl_args);
-	}
-
-	goto end;
-
-error:
-	ret = -1;
-
-end:
-	return ret;
-}
-
 /*
  * Creates a Babeltrace config object from the arguments of a convert
  * command.
@@ -3604,9 +3708,8 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 	GList *source_names = NULL;
 	GList *filter_names = NULL;
 	GList *sink_names = NULL;
-	GList *leftovers = NULL;
-	GPtrArray *implicit_ctf_inputs_args = NULL;
-	struct implicit_component_args base_implicit_ctf_input_args = { 0 };
+	bt_value *leftovers = NULL;
+	struct implicit_component_args implicit_ctf_input_args = { 0 };
 	struct implicit_component_args implicit_ctf_output_args = { 0 };
 	struct implicit_component_args implicit_lttng_live_args = { 0 };
 	struct implicit_component_args implicit_dummy_args = { 0 };
@@ -3630,7 +3733,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 		goto end;
 	}
 
-	if (init_implicit_component_args(&base_implicit_ctf_input_args,
+	if (init_implicit_component_args(&implicit_ctf_input_args,
 			"source.ctf.fs", false)) {
 		goto error;
 	}
@@ -3670,13 +3773,6 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 		goto error;
 	}
 
-	implicit_ctf_inputs_args = g_ptr_array_new_with_free_func(
-		(GDestroyNotify) destroy_implicit_component_args);
-	if (!implicit_ctf_inputs_args) {
-		print_err_oom();
-		goto error;
-	}
-
 	all_names = bt_value_map_create();
 	if (!all_names) {
 		print_err_oom();
@@ -3706,14 +3802,20 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 		goto error;
 	}
 
+	leftovers = bt_value_array_create();
+	if (!leftovers) {
+		print_err_oom();
+		goto error;
+	}
+
 	/*
 	 * First pass: collect all arguments which need to be passed
 	 * as is to the run command. This pass can also add --name
 	 * arguments if needed to automatically name unnamed component
 	 * instances. Also it does the following transformations:
 	 *
-	 *     --path=PATH -> --key path --value PATH
-	 *     --url=URL   -> --key url --value URL
+	 *     --path=PATH -> --params=path="PATH"
+	 *     --url=URL   -> --params=url="URL"
 	 *
 	 * Also it appends the plugin paths of --plugin-path to
 	 * `plugin_paths`.
@@ -3827,23 +3929,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 				goto error;
 			}
 
-			if (bt_value_array_append_string_element(run_args, "--key")) {
-				print_err_oom();
-				goto error;
-			}
-
-			if (bt_value_array_append_string_element(run_args, "path")) {
-				print_err_oom();
-				goto error;
-			}
-
-			if (bt_value_array_append_string_element(run_args, "--value")) {
-				print_err_oom();
-				goto error;
-			}
-
-			if (bt_value_array_append_string_element(run_args, arg)) {
-				print_err_oom();
+			if (append_string_parameter_to_args(run_args, "path", arg)) {
 				goto error;
 			}
 			break;
@@ -3854,23 +3940,8 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 				goto error;
 			}
 
-			if (bt_value_array_append_string_element(run_args, "--key")) {
-				print_err_oom();
-				goto error;
-			}
 
-			if (bt_value_array_append_string_element(run_args, "url")) {
-				print_err_oom();
-				goto error;
-			}
-
-			if (bt_value_array_append_string_element(run_args, "--value")) {
-				print_err_oom();
-				goto error;
-			}
-
-			if (bt_value_array_append_string_element(run_args, arg)) {
-				print_err_oom();
+			if (append_string_parameter_to_args(run_args, "url", arg)) {
 				goto error;
 			}
 			break;
@@ -4099,19 +4170,19 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 			append_implicit_component_param(
 				&implicit_text_args, "clock-gmt", "yes");
 			append_implicit_component_param(
-				&implicit_trimmer_args, "clock-gmt", "yes");
+				&implicit_trimmer_args, "gmt", "yes");
 			implicit_text_args.exists = true;
 			break;
 		case OPT_CLOCK_OFFSET:
-			base_implicit_ctf_input_args.exists = true;
+			implicit_ctf_input_args.exists = true;
 			append_implicit_component_param(
-					&base_implicit_ctf_input_args,
+					&implicit_ctf_input_args,
 					"clock-class-offset-s", arg);
 			break;
 		case OPT_CLOCK_OFFSET_NS:
-			base_implicit_ctf_input_args.exists = true;
+			implicit_ctf_input_args.exists = true;
 			append_implicit_component_param(
-					&base_implicit_ctf_input_args,
+					&implicit_ctf_input_args,
 					"clock-class-offset-ns", arg);
 			break;
 		case OPT_CLOCK_SECONDS:
@@ -4202,7 +4273,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 			got_input_format_opt = true;
 
 			if (strcmp(arg, "ctf") == 0) {
-				base_implicit_ctf_input_args.exists = true;
+				implicit_ctf_input_args.exists = true;
 			} else if (strcmp(arg, "lttng-live") == 0) {
 				implicit_lttng_live_args.exists = true;
 			} else {
@@ -4311,16 +4382,8 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 
 	/* Consume and keep leftover arguments */
 	while ((leftover = poptGetArg(pc))) {
-		GString *gs_leftover = g_string_new(leftover);
-
-		if (!gs_leftover) {
-			print_err_oom();
-			goto error;
-		}
-
-		leftovers = g_list_append(leftovers, gs_leftover);
-		if (!leftovers) {
-			g_string_free(gs_leftover, TRUE);
+		bt_value_status status = bt_value_array_append_string_element(leftovers, leftover);
+		if (status != BT_VALUE_STATUS_OK) {
 			print_err_oom();
 			goto error;
 		}
@@ -4328,14 +4391,14 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 
 	/* Print CTF metadata or print LTTng live sessions */
 	if (print_ctf_metadata) {
-		GString *gs_leftover;
+		const bt_value *bt_val_leftover;
 
-		if (g_list_length(leftovers) == 0) {
+		if (bt_value_array_is_empty(leftovers)) {
 			printf_err("--output-format=ctf-metadata specified without a path\n");
 			goto error;
 		}
 
-		if (g_list_length(leftovers) > 1) {
+		if (bt_value_array_get_size(leftovers) > 1) {
 			printf_err("Too many paths specified for --output-format=ctf-metadata\n");
 			goto error;
 		}
@@ -4345,9 +4408,9 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 			goto error;
 		}
 
-		gs_leftover = leftovers->data;
+		bt_val_leftover = bt_value_array_borrow_element_by_index_const(leftovers, 0);
 		g_string_assign(cfg->cmd_data.print_ctf_metadata.path,
-			gs_leftover->str);
+				bt_value_string_get(bt_val_leftover));
 
 		if (output) {
 			g_string_assign(
@@ -4413,18 +4476,18 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 	}
 
 	/* Decide where the leftover argument(s) go */
-	if (g_list_length(leftovers) > 0) {
+	if (bt_value_array_get_size(leftovers) > 0) {
 		if (implicit_lttng_live_args.exists) {
-			GString *gs_leftover;
+			const bt_value *bt_val_leftover;
 
-			if (g_list_length(leftovers) > 1) {
+			if (bt_value_array_get_size(leftovers) > 1) {
 				printf_err("Too many URLs specified for --output-format=lttng-live\n");
 				goto error;
 			}
 
-			gs_leftover = leftovers->data;
+			bt_val_leftover = bt_value_array_borrow_element_by_index_const(leftovers, 0);
 			lttng_live_url_parts =
-				bt_common_parse_lttng_live_url(gs_leftover->str,
+				bt_common_parse_lttng_live_url(bt_value_string_get(bt_val_leftover),
 					error_buf, sizeof(error_buf));
 			if (!lttng_live_url_parts.proto) {
 				printf_err("Invalid LTTng live URL format: %s\n",
@@ -4441,7 +4504,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 				}
 
 				g_string_assign(cfg->cmd_data.print_lttng_live_sessions.url,
-					gs_leftover->str);
+					bt_value_string_get(bt_val_leftover));
 
 				if (output) {
 					g_string_assign(
@@ -4454,20 +4517,26 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 
 			ret = append_implicit_component_extra_param(
 				&implicit_lttng_live_args, "url",
-				gs_leftover->str);
+				bt_value_string_get(bt_val_leftover));
+			if (ret) {
+				goto error;
+			}
+
+			ret = append_implicit_component_extra_param(
+				&implicit_lttng_live_args,
+				"session-not-found-action", "end");
 			if (ret) {
 				goto error;
 			}
 		} else {
 			/*
-			 * Append one implicit component argument set
-			 * for each leftover (souce.ctf.fs paths). Copy
-			 * the base implicit component arguments.
-			 * Note that they still have to be named later.
+			 * Create one source.ctf.fs component, pass it an array
+			 * with the leftovers.
+			 * Note that it still has to be named later.
 			 */
-			ret = fill_implicit_ctf_inputs_args(
-				implicit_ctf_inputs_args,
-				&base_implicit_ctf_input_args, leftovers);
+			implicit_ctf_input_args.exists = true;
+			ret = append_parameter_to_args(implicit_ctf_input_args.extra_params,
+					"paths", leftovers);
 			if (ret) {
 				goto error;
 			}
@@ -4478,10 +4547,9 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 	 * Ensure mutual exclusion between implicit `source.ctf.fs` and
 	 * `source.ctf.lttng-live` components.
 	 */
-	if (base_implicit_ctf_input_args.exists &&
-			implicit_lttng_live_args.exists) {
+	if (implicit_ctf_input_args.exists && implicit_lttng_live_args.exists) {
 		printf_err("Cannot create both implicit `%s` and `%s` components\n",
-			base_implicit_ctf_input_args.comp_arg->str,
+			implicit_ctf_input_args.comp_arg->str,
 			implicit_lttng_live_args.comp_arg->str);
 		goto error;
 	}
@@ -4491,29 +4559,23 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 	 * components exists, make sure there's at least one leftover
 	 * (which is the path or URL).
 	 */
-	if (base_implicit_ctf_input_args.exists &&
-			g_list_length(leftovers) == 0) {
+	if (implicit_ctf_input_args.exists && bt_value_array_is_empty(leftovers)) {
 		printf_err("Missing path for implicit `%s` component\n",
-			base_implicit_ctf_input_args.comp_arg->str);
+			implicit_ctf_input_args.comp_arg->str);
 		goto error;
 	}
 
-	if (implicit_lttng_live_args.exists && g_list_length(leftovers) == 0) {
+	if (implicit_lttng_live_args.exists && bt_value_array_is_empty(leftovers)) {
 		printf_err("Missing URL for implicit `%s` component\n",
 			implicit_lttng_live_args.comp_arg->str);
 		goto error;
 	}
 
 	/* Assign names to implicit components */
-	for (i = 0; i < implicit_ctf_inputs_args->len; i++) {
-		struct implicit_component_args *impl_args =
-			g_ptr_array_index(implicit_ctf_inputs_args, i);
-
-		ret = assign_name_to_implicit_component(impl_args,
-			"source-ctf-fs", all_names, &source_names, true);
-		if (ret) {
-			goto error;
-		}
+	ret = assign_name_to_implicit_component(&implicit_ctf_input_args,
+		"source-ctf-fs", all_names, &source_names, true);
+	if (ret) {
+		goto error;
 	}
 
 	ret = assign_name_to_implicit_component(&implicit_lttng_live_args,
@@ -4599,15 +4661,9 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 	 * Append the equivalent run arguments for the implicit
 	 * components.
 	 */
-	for (i = 0; i < implicit_ctf_inputs_args->len; i++) {
-		struct implicit_component_args *impl_args =
-			g_ptr_array_index(implicit_ctf_inputs_args, i);
-
-		ret = append_run_args_for_implicit_component(impl_args,
-			run_args);
-		if (ret) {
-			goto error;
-		}
+	ret = append_run_args_for_implicit_component(&implicit_ctf_input_args, run_args);
+	if (ret) {
+		goto error;
 	}
 
 	ret = append_run_args_for_implicit_component(&implicit_lttng_live_args,
@@ -4744,17 +4800,13 @@ end:
 		g_string_free(cur_name_prefix, TRUE);
 	}
 
-	if (implicit_ctf_inputs_args) {
-		g_ptr_array_free(implicit_ctf_inputs_args, TRUE);
-	}
-
 	bt_value_put_ref(run_args);
 	bt_value_put_ref(all_names);
 	destroy_glist_of_gstring(source_names);
 	destroy_glist_of_gstring(filter_names);
 	destroy_glist_of_gstring(sink_names);
-	destroy_glist_of_gstring(leftovers);
-	finalize_implicit_component_args(&base_implicit_ctf_input_args);
+	bt_value_put_ref(leftovers);
+	finalize_implicit_component_args(&implicit_ctf_input_args);
 	finalize_implicit_component_args(&implicit_ctf_output_args);
 	finalize_implicit_component_args(&implicit_lttng_live_args);
 	finalize_implicit_component_args(&implicit_dummy_args);