Fix: cli: replace remaining log level `V` (verbose) -> `T` (trace)

[babeltrace.git] / src / cli / babeltrace2-cfg-cli-args.c

diff --git a/src/cli/babeltrace2-cfg-cli-args.c b/src/cli/babeltrace2-cfg-cli-args.c
index 1e2da506ad49722fe2a9535bc9ba041bed920e46..63a815e66d0ed82b9732962ca840ab7baab441d7 100644 (file)
--- a/src/cli/babeltrace2-cfg-cli-args.c
+++ b/src/cli/babeltrace2-cfg-cli-args.c
@@ -1300,6 +1300,8 @@ void print_expected_params_format(FILE *fp)
        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, "* Map, formatted as an opening `{`, a comma-separated list of PARAM=VALUE\n");
+       fprintf(fp, "  assignments and a closing `}`.\n");
        fprintf(fp, "\n");
        fprintf(fp, "You can put whitespaces allowed around individual `=` and `,` symbols.\n");
        fprintf(fp, "\n");
@@ -1722,7 +1724,7 @@ void print_run_usage(FILE *fp)
        fprintf(fp, "  -x, --connect=CONNECTION          Connect two created components (see the\n");
        fprintf(fp, "                                    expected format of CONNECTION below)\n");
        fprintf(fp, "  -l, --log-level=LVL               Set the log level of the current component to LVL\n");
-       fprintf(fp, "                                    (`N`, `V`, `D`, `I`, `W`, `E`, or `F`)\n");
+       fprintf(fp, "                                    (`N`, `T`, `D`, `I`, `W`, `E`, or `F`)\n");
        fprintf(fp, "  -p, --params=PARAMS               Add initialization parameters PARAMS to the\n");
        fprintf(fp, "                                    current component (see the expected format\n");
        fprintf(fp, "                                    of PARAMS below)\n");
@@ -2126,7 +2128,7 @@ void print_convert_usage(FILE *fp)
        fprintf(fp, "                                    conversion graph, and optionally name it\n");
        fprintf(fp, "                                    NAME\n");
        fprintf(fp, "  -l, --log-level=LVL               Set the log level of the current component to LVL\n");
-       fprintf(fp, "                                    (`N`, `V`, `D`, `I`, `W`, `E`, or `F`)\n");
+       fprintf(fp, "                                    (`N`, `T`, `D`, `I`, `W`, `E`, or `F`)\n");
        fprintf(fp, "  -p, --params=PARAMS               Add initialization parameters PARAMS to the\n");
        fprintf(fp, "                                    current component (see the expected format\n");
        fprintf(fp, "                                    of PARAMS below)\n");
@@ -3172,6 +3174,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
        struct bt_argpar_parse_ret argpar_parse_ret = { 0 };
        GString *name_gstr = NULL;
        GString *component_arg_for_run = NULL;
+       bt_value *live_inputs_array_val = NULL;
 
        /*
         * Array of `struct implicit_component_args *` created for the sources
@@ -3996,9 +3999,22 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
                                goto end;
                        }
 
-                       ret = append_implicit_component_extra_param(
-                               &implicit_lttng_live_args, "url",
-                               bt_value_string_get(bt_val_non_opt));
+                       live_inputs_array_val = bt_value_array_create();
+                       if (!live_inputs_array_val) {
+                               BT_CLI_LOGE_APPEND_CAUSE_OOM();
+                               goto error;
+                       }
+
+                       if (bt_value_array_append_string_element(
+                                       live_inputs_array_val,
+                                       bt_value_string_get(bt_val_non_opt))) {
+                               BT_CLI_LOGE_APPEND_CAUSE_OOM();
+                               goto error;
+                       }
+
+                       ret = append_parameter_to_args(
+                               implicit_lttng_live_args.extra_params,
+                               "inputs", live_inputs_array_val);
                        if (ret) {
                                goto error;
                        }
@@ -4337,6 +4353,7 @@ end:
                g_string_free(name_gstr, TRUE);
        }
 
+       bt_value_put_ref(live_inputs_array_val);
        bt_value_put_ref(run_args);
        bt_value_put_ref(all_names);
        destroy_glist_of_gstring(source_names);
@@ -4379,9 +4396,9 @@ void print_gen_usage(FILE *fp)
        fprintf(fp, "\n");
        fprintf(fp, "General options:\n");
        fprintf(fp, "\n");
-       fprintf(fp, "  -d, --debug                       Enable debug mode (same as --log-level=V)\n");
+       fprintf(fp, "  -d, --debug                       Enable debug mode (same as --log-level=T)\n");
        fprintf(fp, "  -h, --help                        Show this help and quit\n");
-       fprintf(fp, "  -l, --log-level=LVL               Set the default log level to LVL (`N`, `V`, `D`,\n");
+       fprintf(fp, "  -l, --log-level=LVL               Set the default log level to LVL (`N`, `T`, `D`,\n");
        fprintf(fp, "                                    `I`, `W` (default), `E`, or `F`)\n");
        fprintf(fp, "      --omit-home-plugin-path       Omit home plugins from plugin search path\n");
        fprintf(fp, "                                    (~/.local/lib/babeltrace2/plugins)\n");