/* Expect a value */
INI_EXPECT_VALUE,
- /* Expect a negative number value */
- INI_EXPECT_VALUE_NUMBER_NEG,
-
/* Expect a comma character (',') */
INI_EXPECT_COMMA,
};
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)
{
state->scanner, "'='");
break;
case INI_EXPECT_VALUE:
- case INI_EXPECT_VALUE_NUMBER_NEG:
ini_append_error_expecting(state,
state->scanner, "value");
break;
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;
- }
-
+ value = ini_parse_value(state);
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;
- }
-
- if (!value) {
- ini_append_error_expecting(state,
- state->scanner, "value");
goto error;
}
OPT_FIELDS,
OPT_HELP,
OPT_INPUT_FORMAT,
- OPT_KEY,
OPT_LIST,
OPT_NAME,
OPT_NAMES,
OPT_STREAM_INTERSECTION,
OPT_TIMERANGE,
OPT_URL,
- OPT_VALUE,
OPT_VERBOSE,
};
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");
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");
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);
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");
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");
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;
{ "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 },
{ "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);
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",
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);
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);
+}
+
+/*
+ * 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;
+ }
+
+ 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 error;
+ }
+
+ g_string_printf(buf, "\"%s\"", escaped_str_value);
+
+ g_free(escaped_str_value);
+ break;
+ }
+ default:
+ abort();
+ }
+
+ 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,
* 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`.
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;
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;
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:
projects / babeltrace.git / blobdiff