X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=converter%2Fbabeltrace-cfg.c;h=1ca58e0a3c1464854eb2ff5275d80048667e40ee;hb=ad6a19bd28bc5c31c4a03468ee5eb80a81c6443f;hp=937324e5d1ffc33023c16e93bec0779be8865452;hpb=015cee23405628ddbab968175508e9d5c0e8b00d;p=babeltrace.git diff --git a/converter/babeltrace-cfg.c b/converter/babeltrace-cfg.c index 937324e5..1ca58e0a 100644 --- a/converter/babeltrace-cfg.c +++ b/converter/babeltrace-cfg.c @@ -280,7 +280,7 @@ int ini_handle_state(struct ini_parsing_state *state) if (bt_value_map_has_key(state->params, state->last_map_key)) { g_string_append_printf(state->ini_error, - "Duplicate parameter key: \"%s\"\n", + "Duplicate parameter key: `%s`\n", state->last_map_key); goto error; } @@ -727,11 +727,11 @@ void print_legacy_usage(FILE *fp) fprintf(fp, " --clock-seconds Print the timestamps as [SEC.NS]\n"); fprintf(fp, " (default format: [HH:MM:SS.NS])\n"); fprintf(fp, " --debug-info-dir=DIR Search for debug info in directory DIR\n"); - fprintf(fp, " (default: \"/usr/lib/debug\")\n"); + fprintf(fp, " (default: `/usr/lib/debug`)\n"); fprintf(fp, " --debug-info-full-path Show full debug info source and binary paths\n"); fprintf(fp, " --debug-info-target-prefix=DIR Use directory DIR as a prefix when looking\n"); fprintf(fp, " up executables during debug info analysis\n"); - fprintf(fp, " (default: \"/usr/lib/debug\")\n"); + fprintf(fp, " (default: `/usr/lib/debug`)\n"); fprintf(fp, " -f, --fields=NAME[,NAME]... Print additional fields:\n"); fprintf(fp, " all, trace, trace:hostname, trace:domain,\n"); fprintf(fp, " trace:procname, trace:vpid, loglevel, emf,\n"); @@ -770,11 +770,13 @@ void print_usage(FILE *fp) fprintf(fp, " --end-ns=NS Set the end timestamp of the latest source\n"); fprintf(fp, " component instance to NS\n"); fprintf(fp, " -l, --list List available plugins and their components\n"); + fprintf(fp, " -P, --path=PATH Set the `path` parameter of the latest source\n"); + fprintf(fp, " or sink component to PATH\n"); fprintf(fp, " -p, --params=PARAMS Set the parameters of the latest source or\n"); fprintf(fp, " sink component instance (in command-line \n"); fprintf(fp, " order) to PARAMS (see the exact format of\n"); fprintf(fp, " PARAMS below)\n"); - fprintf(fp, " -P, --plugin-path=PATH[:PATH]... Set paths from which dynamic plugins can be\n"); + fprintf(fp, " --plugin-path=PATH[:PATH]... Set paths from which dynamic plugins can be\n"); fprintf(fp, " loaded to PATH\n"); fprintf(fp, " --reset-base-begin-ns Reset the current base beginning timestamp\n"); fprintf(fp, " of the following source component instances\n"); @@ -918,7 +920,7 @@ struct bt_config_component *bt_config_component_from_arg(const char *arg) plugin_component_names_from_arg(arg, &plugin_name, &component_name); if (!plugin_name || !component_name) { - printf_err("Cannot get plugin or component name\n"); + printf_err("Cannot get plugin or component class name\n"); goto error; } @@ -1160,7 +1162,7 @@ struct bt_value *names_from_arg(const char *arg) goto error; } } else { - printf_err("Unknown field name: \"%s\"\n", + printf_err("Unknown field name: `%s`\n", identifier); goto error; } @@ -1177,7 +1179,7 @@ struct bt_value *names_from_arg(const char *arg) end: if (found_none && found_all) { - printf_err("Only either \"all\" or \"none\" can be specified in the list given to the \"--names\" option, but not both.\n"); + printf_err("Only either `all` or `none` can be specified in the list given to the --names option, but not both.\n"); goto error; } /* @@ -1252,7 +1254,7 @@ struct bt_value *fields_from_arg(const char *arg) goto error; } } else { - printf_err("Unknown field name: \"%s\"\n", + printf_err("Unknown field name: `%s`\n", identifier); goto error; } @@ -1832,9 +1834,9 @@ void print_output_legacy_to_sinks( assert(false); } - printf_err("Both \"%s\" legacy output format and non-legacy sink(s) specified.\n\n", + printf_err("Both `%s` legacy output format and non-legacy sink component\ninstances(s) specified.\n\n", input_format); - printf_err("Specify the following non-legacy sink instead of the legacy \"%s\"\noutput format options:\n\n", + printf_err("Specify the following non-legacy sink component instance instead of the\nlegacy `%s` output format options:\n\n", input_format); g_string_append(str, "-o "); @@ -1943,9 +1945,9 @@ void print_input_legacy_to_sources(enum legacy_input_format legacy_input_format, assert(false); } - printf_err("Both \"%s\" legacy input format and non-legacy source(s) specified.\n\n", + printf_err("Both `%s` legacy input format and non-legacy source component\ninstance(s) specified.\n\n", input_format); - printf_err("Specify the following non-legacy source(s) instead of the legacy \"%s\"\ninput format options and positional arguments:\n\n", + printf_err("Specify the following non-legacy source component instance(s) instead of the\nlegacy `%s` input format options and positional arguments:\n\n", input_format); for (i = 0; i < bt_value_array_size(legacy_input_paths); i++) { @@ -2063,10 +2065,10 @@ bool validate_cfg(struct bt_config *cfg, if (bt_value_array_is_empty(legacy_input_paths)) { switch (*legacy_input_format) { case LEGACY_INPUT_FORMAT_CTF: - printf_err("No input path specified for legacy \"ctf\" input format\n"); + printf_err("No input path specified for legacy `ctf` input format\n"); break; case LEGACY_INPUT_FORMAT_LTTNG_LIVE: - printf_err("No URL specified for legacy \"lttng-live\" input format\n"); + printf_err("No URL specified for legacy `lttng-live` input format\n"); break; default: assert(false); @@ -2098,7 +2100,7 @@ bool validate_cfg(struct bt_config *cfg, if (text_legacy_opts_is_any_set(text_legacy_opts) && *legacy_output_format != LEGACY_OUTPUT_FORMAT_TEXT) { - printf_err("Options for legacy \"text\" output format specified with a different legacy output format\n"); + printf_err("Options for legacy `text` output format specified with a different legacy output format\n"); goto error; } @@ -2116,7 +2118,7 @@ bool validate_cfg(struct bt_config *cfg, */ if (*legacy_output_format == LEGACY_OUTPUT_FORMAT_CTF_METADATA && *legacy_input_format != LEGACY_INPUT_FORMAT_CTF) { - printf_err("Legacy \"ctf-metadata\" output format requires using legacy \"ctf\" input format\n"); + printf_err("Legacy `ctf-metadata` output format requires using legacy `ctf` input format\n"); goto error; } @@ -2200,6 +2202,7 @@ enum { OPT_NO_DELTA, OPT_OUTPUT_FORMAT, OPT_OUTPUT_PATH, + OPT_PATH, OPT_PARAMS, OPT_PLUGIN_PATH, OPT_RESET_BASE_BEGIN_NS, @@ -2240,8 +2243,9 @@ static struct poptOption long_options[] = { { "no-delta", '\0', POPT_ARG_NONE, NULL, OPT_NO_DELTA, NULL, NULL }, { "output", 'w', POPT_ARG_STRING, NULL, OPT_OUTPUT_PATH, NULL, NULL }, { "output-format", 'o', POPT_ARG_STRING, NULL, OPT_OUTPUT_FORMAT, NULL, NULL }, + { "path", 'P', POPT_ARG_STRING, NULL, OPT_PATH, NULL, NULL }, { "params", 'p', POPT_ARG_STRING, NULL, OPT_PARAMS, NULL, NULL }, - { "plugin-path", 'P', POPT_ARG_STRING, NULL, OPT_PLUGIN_PATH, NULL, NULL }, + { "plugin-path", '\0', POPT_ARG_STRING, NULL, OPT_PLUGIN_PATH, NULL, NULL }, { "reset-base-begin-ns", '\0', POPT_ARG_NONE, NULL, OPT_RESET_BASE_BEGIN_NS, NULL, NULL }, { "reset-base-end-ns", '\0', POPT_ARG_NONE, NULL, OPT_RESET_BASE_END_NS, NULL, NULL }, { "reset-base-params", 'r', POPT_ARG_NONE, NULL, OPT_RESET_BASE_PARAMS, NULL, NULL }, @@ -2454,14 +2458,19 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) cur_cfg_comp = bt_config_component_from_arg(arg); if (!cur_cfg_comp) { - printf_err("Invalid source component format:\n %s\n", + printf_err("Invalid format for --source option's argument:\n %s\n", arg); goto error; } assert(cur_base_params); bt_put(cur_cfg_comp->params); - cur_cfg_comp->params = bt_get(cur_base_params); + cur_cfg_comp->params = bt_value_copy(cur_base_params); + if (!cur_cfg_comp) { + print_err_oom(); + goto end; + } + cur_cfg_comp->begin_ns = cur_base_begin_ns; cur_cfg_comp->end_ns = cur_base_end_ns; cur_cfg_comp_dest = BT_CONFIG_COMPONENT_DEST_SOURCE; @@ -2513,14 +2522,19 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) cur_cfg_comp = bt_config_component_from_arg(arg); if (!cur_cfg_comp) { - printf_err("Invalid sink component format:\n %s\n", + printf_err("Invalid format for --sink option's argument:\n %s\n", arg); goto error; } assert(cur_base_params); bt_put(cur_cfg_comp->params); - cur_cfg_comp->params = bt_get(cur_base_params); + cur_cfg_comp->params = bt_value_copy(cur_base_params); + if (!cur_cfg_comp) { + print_err_oom(); + goto end; + } + cur_cfg_comp_dest = BT_CONFIG_COMPONENT_DEST_SINK; cur_cfg_comp_params_set = false; break; @@ -2536,7 +2550,7 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) } if (cur_cfg_comp_params_set) { - printf_err("Duplicate --params option for the same current component (%s.%s)\n", + printf_err("Duplicate --params option for the same current component\ninstance (class %s.%s)\n", cur_cfg_comp->plugin_name->str, cur_cfg_comp->component_name->str); goto error; @@ -2562,6 +2576,20 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) cur_cfg_comp_params_set = true; break; } + case OPT_PATH: + if (!cur_cfg_comp) { + printf_err("--path option must follow a --source or --sink option\n"); + goto error; + } + + assert(cur_cfg_comp->params); + + if (bt_value_map_insert_string(cur_cfg_comp->params, + "path", arg)) { + print_err_oom(); + goto error; + } + break; case OPT_BASE_PARAMS: { struct bt_value *params = bt_value_from_arg(arg); @@ -2787,7 +2815,7 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) legacy_input_format, &ctf_legacy_opts, legacy_input_paths, cur_base_begin_ns, cur_base_end_ns)) { - printf_err("Cannot convert legacy input format options to source(s)\n"); + printf_err("Cannot convert legacy input format options to source component instance(s)\n"); goto error; } } @@ -2799,7 +2827,7 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) if (legacy_output_format) { if (append_sinks_from_legacy_opts(cfg->sinks, legacy_output_format, &text_legacy_opts)) { - printf_err("Cannot convert legacy output format options to sink(s)\n"); + printf_err("Cannot convert legacy output format options to sink component instance(s)\n"); goto error; } } @@ -2812,7 +2840,7 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) bt_put(cfg_component); if (!validate_source_config_component(cfg_component)) { - printf_err("Invalid source component (%s.%s)\n", + printf_err("Invalid source component instance (class %s.%s)\n", cfg_component->plugin_name->str, cfg_component->component_name->str); goto error;