X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2Fbabeltrace-cfg.c;h=f045bf94e973b6c4c16ef989b64cb4e516d8eff9;hb=5a3ee633fdd379e8acf7535f0ba91fb05234a36a;hp=937324e5d1ffc33023c16e93bec0779be8865452;hpb=015cee23405628ddbab968175508e9d5c0e8b00d;p=babeltrace.git diff --git a/converter/babeltrace-cfg.c b/converter/babeltrace-cfg.c index 937324e5..f045bf94 100644 --- a/converter/babeltrace-cfg.c +++ b/converter/babeltrace-cfg.c @@ -30,11 +30,17 @@ #include #include #include +#include #include #include #include +#include +#include #include "babeltrace-cfg.h" +#define DEFAULT_SOURCE_COMPONENT_NAME "ctf.fs" +#define DEFAULT_SINK_COMPONENT_NAME "text.text" + /* * Error printf() macro which prepends "Error: " the first time it's * called. This gives a nicer feel than having a bunch of error prefixes @@ -280,7 +286,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; } @@ -722,20 +728,19 @@ void print_legacy_usage(FILE *fp) fprintf(fp, " \n"); fprintf(fp, " --clock-cycles Print timestamps in clock cycles\n"); fprintf(fp, " --clock-date Print timestamp dates\n"); - fprintf(fp, " --clock-gmt Print timestamps in GMT time zone\n"); + fprintf(fp, " --clock-gmt Print and parse timestamps in GMT time zone\n"); fprintf(fp, " (default: local time zone)\n"); 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"); - fprintf(fp, " callsite\n"); + fprintf(fp, " trace:procname, trace:vpid, loglevel, emf\n"); fprintf(fp, " (default: trace:hostname, trace:procname,\n"); fprintf(fp, " trace:vpid)\n"); fprintf(fp, " -n, --names=NAME[,NAME]... Print field names:\n"); @@ -755,31 +760,27 @@ void print_usage(FILE *fp) { fprintf(fp, "Usage: babeltrace [OPTIONS]\n"); fprintf(fp, "\n"); - fprintf(fp, " -B, --base-begin-ns=NS Set NS as the current base beginning\n"); - fprintf(fp, " timestamp of the following source component\n"); - fprintf(fp, " instances\n"); - fprintf(fp, " -E, --base-end-ns=NS Set NS as the current base end timestamp\n"); - fprintf(fp, " of the following source component instances\n"); fprintf(fp, " -b, --base-params=PARAMS Set PARAMS as the current base parameters\n"); fprintf(fp, " of the following source and sink component\n"); fprintf(fp, " instances (see the exact format of PARAMS\n"); fprintf(fp, " below)\n"); - fprintf(fp, " --begin-ns=NS Set the beginning timestamp of the latest\n"); - fprintf(fp, " source component instance to NS\n"); + fprintf(fp, " --begin=BEGIN Set beginning time to BEGIN\n"); + fprintf(fp, " (format: [YYYY-MM-DD [hh:mm:]]ss[.nnnnnnnnn])\n"); fprintf(fp, " -d, --debug Enable debug mode\n"); - fprintf(fp, " --end-ns=NS Set the end timestamp of the latest source\n"); - fprintf(fp, " component instance to NS\n"); + fprintf(fp, " --end=END Set end time to END\n"); + fprintf(fp, " (format: [YYYY-MM-DD [hh:mm:]]ss[.nnnnnnnnn])\n"); fprintf(fp, " -l, --list List available plugins and their components\n"); + fprintf(fp, " --omit-home-plugin-path Omit home plugins from plugin search path\n"); + fprintf(fp, " (~/.local/lib/babeltrace/plugins)\n"); + fprintf(fp, " --omit-system-plugin-path Omit system plugins from plugin search 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, " 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"); - fprintf(fp, " --reset-base-end-ns Reset the current base end timestamp of the\n"); - fprintf(fp, " following source component instances\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, " --plugin-path=PATH[:PATH]... Add PATH to the list of paths from which dynamic\n"); + fprintf(fp, " plugins can be loaded\n"); fprintf(fp, " -r, --reset-base-params Reset the current base parameters of the\n"); fprintf(fp, " following source and sink component\n"); fprintf(fp, " instances to an empty map\n"); @@ -789,6 +790,8 @@ void print_usage(FILE *fp) fprintf(fp, " -i, --source=PLUGIN.COMPCLS Instantiate a source component from plugin\n"); fprintf(fp, " PLUGIN and component class COMPCLS (may be\n"); fprintf(fp, " repeated)\n"); + fprintf(fp, " --timerange=TIMERANGE Set time range to TIMERANGE: BEGIN,END or\n"); + fprintf(fp, " [BEGIN,END] (where [ and ] are actual brackets)\n"); fprintf(fp, " -h --help Show this help\n"); fprintf(fp, " --help-legacy Show Babeltrace 1.x legacy options\n"); fprintf(fp, " -v, --verbose Enable verbose output\n"); @@ -892,10 +895,6 @@ struct bt_config_component *bt_config_component_create(const char *plugin_name, goto error; } - /* Begin/end timestamp: not set */ - cfg_component->begin_ns = -1ULL; - cfg_component->end_ns = -1ULL; - goto end; error: @@ -918,7 +917,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; } @@ -967,68 +966,43 @@ end: return; } +static void destroy_gstring(void *data) +{ + g_string_free(data, TRUE); +} + /* * Extracts the various paths from the string arg, delimited by ':', - * and converts them to an array value object. - * - * Returned array value object is empty if arg is empty. - * - * Return value is owned by the caller. + * and appends them to the array value object plugin_paths. */ -static -struct bt_value *plugin_paths_from_arg(const char *arg) +enum bt_value_status bt_config_append_plugin_paths( + struct bt_value *plugin_paths, const char *arg) { - struct bt_value *plugin_paths; - const char *at = arg; - const char *end = arg + strlen(arg); + enum bt_value_status status = BT_VALUE_STATUS_OK; + GPtrArray *dirs = g_ptr_array_new_with_free_func(destroy_gstring); + int ret; + size_t i; - plugin_paths = bt_value_array_create(); - if (!plugin_paths) { - print_err_oom(); - goto error; + if (!dirs) { + status = BT_VALUE_STATUS_ERROR; + goto end; } - while (at < end) { - int ret; - GString *path; - const char *next_colon; - - next_colon = strchr(at, ':'); - if (next_colon == at) { - /* - * Empty path: try next character (supported - * to conform to the typical parsing of $PATH). - */ - at++; - continue; - } else if (!next_colon) { - /* No more colon: use the remaining */ - next_colon = arg + strlen(arg); - } - - path = g_string_new(NULL); - if (!path) { - print_err_oom(); - goto error; - } - - g_string_append_len(path, at, next_colon - at); - at = next_colon + 1; - ret = bt_value_array_append_string(plugin_paths, path->str); - g_string_free(path, TRUE); - if (ret) { - print_err_oom(); - goto error; - } + ret = bt_common_append_plugin_path_dirs(arg, dirs); + if (ret) { + status = BT_VALUE_STATUS_ERROR; + goto end; } - goto end; + for (i = 0; i < dirs->len; i++) { + GString *dir = g_ptr_array_index(dirs, i); -error: - BT_PUT(plugin_paths); + bt_value_array_append_string(plugin_paths, dir->str); + } end: - return plugin_paths; + g_ptr_array_free(dirs, TRUE); + return status; } /* @@ -1160,7 +1134,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 +1151,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 +1226,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; } @@ -1583,8 +1557,7 @@ static int append_sources_from_legacy_opts(GPtrArray *sources, enum legacy_input_format legacy_input_format, struct ctf_legacy_opts *ctf_legacy_opts, - struct bt_value *legacy_input_paths, - uint64_t begin_ns, uint64_t end_ns) + struct bt_value *legacy_input_paths) { int ret = 0; int i; @@ -1649,8 +1622,6 @@ int append_sources_from_legacy_opts(GPtrArray *sources, } BT_MOVE(bt_config_component->params, params); - bt_config_component->begin_ns = begin_ns; - bt_config_component->end_ns = end_ns; /* Move created component configuration to the array */ g_ptr_array_add(sources, bt_config_component); @@ -1832,9 +1803,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 +1914,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++) { @@ -1999,28 +1970,6 @@ end: return; } -/* - * Validates a given source component configuration. - */ -static -bool validate_source_config_component(struct bt_config_component *cfg_comp) -{ - bool valid = false; - - if (cfg_comp->begin_ns != -1ULL && cfg_comp->end_ns != -1ULL) { - if (cfg_comp->begin_ns > cfg_comp->end_ns) { - printf_err("Beginning timestamp (%" PRIu64 ") is greater than end timestamp (%" PRIu64 ")\n", - cfg_comp->begin_ns, cfg_comp->end_ns); - goto end; - } - } - - valid = true; - -end: - return valid; -} - /* * Validates a given configuration, with optional legacy input and * output formats options. Prints useful error messages if anything @@ -2041,14 +1990,12 @@ bool validate_cfg(struct bt_config *cfg, /* Determine if the input and output should be legacy-style */ if (*legacy_input_format != LEGACY_INPUT_FORMAT_NONE || - cfg->sources->len == 0 || !bt_value_array_is_empty(legacy_input_paths) || ctf_legacy_opts_is_any_set(ctf_legacy_opts)) { legacy_input = true; } if (*legacy_output_format != LEGACY_OUTPUT_FORMAT_NONE || - cfg->sinks->len == 0 || text_legacy_opts_is_any_set(text_legacy_opts)) { legacy_output = true; } @@ -2063,10 +2010,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 +2045,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 +2063,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; } @@ -2145,40 +2092,11 @@ int parse_int64(const char *arg, int64_t *val) return 0; } -/* - * Parses a time in nanoseconds. - * - * Returns a negative value if anything goes wrong. - */ -static -int ns_from_arg(const char *arg, uint64_t *ns) -{ - int ret = 0; - int64_t value; - - if (parse_int64(arg, &value)) { - ret = -1; - goto end; - } - - if (value < 0) { - ret = -1; - goto end; - } - - *ns = (uint64_t) value; - -end: - return ret; -} - /* popt options */ enum { OPT_NONE = 0, - OPT_BASE_BEGIN_NS, - OPT_BASE_END_NS, OPT_BASE_PARAMS, - OPT_BEGIN_NS, + OPT_BEGIN, OPT_CLOCK_CYCLES, OPT_CLOCK_DATE, OPT_CLOCK_FORCE_CORRELATE, @@ -2190,7 +2108,7 @@ enum { OPT_DEBUG_INFO_DIR, OPT_DEBUG_INFO_FULL_PATH, OPT_DEBUG_INFO_TARGET_PREFIX, - OPT_END_NS, + OPT_END, OPT_FIELDS, OPT_HELP, OPT_HELP_LEGACY, @@ -2200,25 +2118,25 @@ enum { OPT_NO_DELTA, OPT_OUTPUT_FORMAT, OPT_OUTPUT_PATH, + OPT_PATH, OPT_PARAMS, OPT_PLUGIN_PATH, - OPT_RESET_BASE_BEGIN_NS, - OPT_RESET_BASE_END_NS, OPT_RESET_BASE_PARAMS, OPT_SINK, OPT_SOURCE, OPT_STREAM_INTERSECTION, + OPT_TIMERANGE, OPT_VERBOSE, OPT_VERSION, + OPT_OMIT_SYSTEM_PLUGIN_PATH, + OPT_OMIT_HOME_PLUGIN_PATH, }; /* popt long option descriptions */ static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ - { "base-begin-ns", 'B', POPT_ARG_STRING, NULL, OPT_BASE_BEGIN_NS, NULL, NULL }, - { "base-end-ns", 'E', POPT_ARG_STRING, NULL, OPT_BASE_END_NS, NULL, NULL }, { "base-params", 'b', POPT_ARG_STRING, NULL, OPT_BASE_PARAMS, NULL, NULL }, - { "begin-ns", '\0', POPT_ARG_STRING, NULL, OPT_BEGIN_NS, NULL, NULL }, + { "begin", '\0', POPT_ARG_STRING, NULL, OPT_BEGIN, NULL, NULL }, { "clock-cycles", '\0', POPT_ARG_NONE, NULL, OPT_CLOCK_CYCLES, NULL, NULL }, { "clock-date", '\0', POPT_ARG_NONE, NULL, OPT_CLOCK_DATE, NULL, NULL }, { "clock-force-correlate", '\0', POPT_ARG_NONE, NULL, OPT_CLOCK_FORCE_CORRELATE, NULL, NULL }, @@ -2230,7 +2148,7 @@ static struct poptOption long_options[] = { { "debug-info-dir", 0, POPT_ARG_STRING, NULL, OPT_DEBUG_INFO_DIR, NULL, NULL }, { "debug-info-full-path", 0, POPT_ARG_NONE, NULL, OPT_DEBUG_INFO_FULL_PATH, NULL, NULL }, { "debug-info-target-prefix", 0, POPT_ARG_STRING, NULL, OPT_DEBUG_INFO_TARGET_PREFIX, NULL, NULL }, - { "end-ns", '\0', POPT_ARG_STRING, NULL, OPT_END_NS, NULL, NULL }, + { "end", '\0', POPT_ARG_STRING, NULL, OPT_END, NULL, NULL }, { "fields", 'f', POPT_ARG_STRING, NULL, OPT_FIELDS, NULL, NULL }, { "help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL }, { "help-legacy", '\0', POPT_ARG_NONE, NULL, OPT_HELP_LEGACY, NULL, NULL }, @@ -2240,16 +2158,18 @@ 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 }, - { "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 }, + { "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 }, { "sink", '\0', POPT_ARG_STRING, NULL, OPT_SINK, NULL, NULL }, { "source", '\0', POPT_ARG_STRING, NULL, OPT_SOURCE, NULL, NULL }, { "stream-intersection", '\0', POPT_ARG_NONE, NULL, OPT_STREAM_INTERSECTION, NULL, NULL }, + { "timerange", '\0', POPT_ARG_STRING, NULL, OPT_TIMERANGE, NULL, NULL }, { "verbose", 'v', POPT_ARG_NONE, NULL, OPT_VERBOSE, NULL, NULL }, { "version", 'V', POPT_ARG_NONE, NULL, OPT_VERSION, NULL, NULL }, + { "omit-system-plugin-path", '\0', POPT_ARG_NONE, NULL, OPT_OMIT_SYSTEM_PLUGIN_PATH, NULL, NULL }, + { "omit-home-plugin-path", '\0', POPT_ARG_NONE, NULL, OPT_OMIT_HOME_PLUGIN_PATH, NULL, NULL }, { NULL, 0, 0, NULL, 0, NULL, NULL }, }; @@ -2282,43 +2202,183 @@ static void add_cfg_comp(struct bt_config *cfg, } } +static int split_timerange(const char *arg, const char **begin, const char **end) +{ + const char *c; + + /* Try to match [begin,end] */ + c = strchr(arg, '['); + if (!c) + goto skip; + *begin = ++c; + c = strchr(c, ','); + if (!c) + goto skip; + *end = ++c; + c = strchr(c, ']'); + if (!c) + goto skip; + goto found; + +skip: + /* Try to match begin,end */ + c = arg; + *begin = c; + c = strchr(c, ','); + if (!c) + goto not_found; + *end = ++c; + /* fall-through */ +found: + return 0; +not_found: + return -1; +} + +static int add_env_var_plugin_paths(struct bt_config *cfg) +{ + int ret = 0; + const char *envvar; + + if (bt_common_is_setuid_setgid()) { + printf_debug("Skipping non-system plugin paths for setuid/setgid binary\n"); + goto end; + } + + envvar = getenv("BABELTRACE_PLUGIN_PATH"); + if (!envvar) { + goto end; + } + + ret = bt_config_append_plugin_paths(cfg->plugin_paths, envvar); + +end: + return ret; +} + +static int append_home_and_system_plugin_paths(struct bt_config *cfg) +{ + int ret; + + if (!cfg->omit_home_plugin_path) { + if (bt_common_is_setuid_setgid()) { + printf_debug("Skipping non-system plugin paths for setuid/setgid binary\n"); + } else { + char *home_plugin_dir = + bt_common_get_home_plugin_path(); + + if (home_plugin_dir) { + ret = bt_config_append_plugin_paths(cfg->plugin_paths, + home_plugin_dir); + free(home_plugin_dir); + + if (ret) { + printf_err("Invalid home plugin path\n"); + goto error; + } + } + } + } + + if (!cfg->omit_system_plugin_path) { + if (bt_config_append_plugin_paths(cfg->plugin_paths, + bt_common_get_system_plugin_path())) { + printf_err("Invalid system plugin path\n"); + goto error; + } + } + return 0; +error: + return -1; +} + +static int append_sources_from_implicit_params(GPtrArray *sources, + struct bt_config_component *implicit_source_comp) +{ + size_t i; + size_t len = sources->len; + + for (i = 0; i < len; i++) { + struct bt_config_component *comp; + struct bt_value *params_to_set; + + comp = g_ptr_array_index(sources, i); + params_to_set = bt_value_map_extend(comp->params, + implicit_source_comp->params); + if (!params_to_set) { + printf_err("Cannot extend legacy component parameters with non-legacy parameters\n"); + goto error; + } + BT_MOVE(comp->params, params_to_set); + } + return 0; +error: + return -1; +} + +struct bt_config *bt_config_create(void) +{ + struct bt_config *cfg; + + /* Create config */ + cfg = g_new0(struct bt_config, 1); + if (!cfg) { + print_err_oom(); + goto error; + } + + bt_object_init(cfg, bt_config_destroy); + cfg->sources = g_ptr_array_new_with_free_func((GDestroyNotify) bt_put); + if (!cfg->sources) { + print_err_oom(); + goto error; + } + + cfg->sinks = g_ptr_array_new_with_free_func((GDestroyNotify) bt_put); + if (!cfg->sinks) { + print_err_oom(); + goto error; + } + + cfg->plugin_paths = bt_value_array_create(); + if (!cfg->plugin_paths) { + print_err_oom(); + goto error; + } +end: + return cfg; +error: + BT_PUT(cfg); + goto end; +} + /* - * Returns a Babeltrace configuration, out of command-line arguments, - * containing everything that is needed to instanciate specific - * components with given parameters. - * - * *exit_code is set to the appropriate exit code to use as far as this - * function goes. + * Initializes a created Babeltrace config object according to the + * command-line arguments found in argv. * - * Return value is NULL on error, otherwise it's owned by the caller. + * Return value is set to the appropriate exit code to use. */ -struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) +int bt_config_init_from_args(struct bt_config *cfg, int argc, const char *argv[]) { - struct bt_config *cfg = NULL; poptContext pc = NULL; char *arg = NULL; - struct ctf_legacy_opts ctf_legacy_opts = { 0 }; - struct text_legacy_opts text_legacy_opts = { 0 }; + struct ctf_legacy_opts ctf_legacy_opts; + struct text_legacy_opts text_legacy_opts; enum legacy_input_format legacy_input_format = LEGACY_INPUT_FORMAT_NONE; enum legacy_output_format legacy_output_format = - LEGACY_OUTPUT_FORMAT_NONE; + LEGACY_OUTPUT_FORMAT_NONE; struct bt_value *legacy_input_paths = NULL; + struct bt_config_component *implicit_source_comp = NULL; struct bt_config_component *cur_cfg_comp = NULL; + bool cur_is_implicit_source = false; + bool use_implicit_source = false; enum bt_config_component_dest cur_cfg_comp_dest = BT_CONFIG_COMPONENT_DEST_SOURCE; struct bt_value *cur_base_params = NULL; - uint64_t cur_base_begin_ns = -1ULL; - uint64_t cur_base_end_ns = -1ULL; - int opt; - bool cur_cfg_comp_params_set = false; - unsigned int i; + int opt, ret = 0; - *exit_code = 0; - - if (argc <= 1) { - print_usage(stdout); - goto end; - } + memset(&ctf_legacy_opts, 0, sizeof(ctf_legacy_opts)); + memset(&text_legacy_opts, 0, sizeof(text_legacy_opts)); text_legacy_opts.output = g_string_new(NULL); if (!text_legacy_opts.output) { @@ -2344,30 +2404,27 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) goto error; } - /* Create config */ - cfg = g_new0(struct bt_config, 1); - if (!cfg) { - print_err_oom(); - goto error; - } - - bt_object_init(cfg, bt_config_destroy); - cfg->sources = g_ptr_array_new_with_free_func((GDestroyNotify) bt_put); - if (!cfg->sources) { + legacy_input_paths = bt_value_array_create(); + if (!legacy_input_paths) { print_err_oom(); goto error; } - cfg->sinks = g_ptr_array_new_with_free_func((GDestroyNotify) bt_put); - if (!cfg->sinks) { - print_err_oom(); + ret = add_env_var_plugin_paths(cfg); + if (ret) { + printf_err("Cannot append plugin paths from BABELTRACE_PLUGIN_PATH\n"); goto error; } - legacy_input_paths = bt_value_array_create(); - if (!legacy_input_paths) { - print_err_oom(); - goto error; + /* Note: implicit source never gets positional base params. */ + implicit_source_comp = bt_config_component_from_arg(DEFAULT_SOURCE_COMPONENT_NAME); + if (implicit_source_comp) { + cur_cfg_comp = implicit_source_comp; + cur_is_implicit_source = true; + use_implicit_source = true; + } else { + printf_debug("Cannot find implicit source plugin \"%s\"", + DEFAULT_SOURCE_COMPONENT_NAME); } /* Parse options */ @@ -2384,17 +2441,21 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) switch (opt) { case OPT_PLUGIN_PATH: - if (cfg->plugin_paths) { - printf_err("Duplicate --plugin-path option\n"); - goto error; - } - - cfg->plugin_paths = plugin_paths_from_arg(arg); - if (!cfg->plugin_paths) { - printf_err("Invalid --plugin-path option's argument\n"); - goto error; + if (bt_common_is_setuid_setgid()) { + printf_debug("Skipping non-system plugin paths for setuid/setgid binary\n"); + } else { + if (bt_config_append_plugin_paths(cfg->plugin_paths, arg)) { + printf_err("Invalid --plugin-path option's argument\n"); + goto error; + } } break; + case OPT_OMIT_SYSTEM_PLUGIN_PATH: + cfg->omit_system_plugin_path = true; + break; + case OPT_OMIT_HOME_PLUGIN_PATH: + cfg->omit_home_plugin_path = true; + break; case OPT_OUTPUT_PATH: if (text_legacy_opts.output->len > 0) { printf_err("Duplicate --output option\n"); @@ -2446,26 +2507,31 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) } } + use_implicit_source = false; + /* Non-legacy: try to create a component config */ - if (cur_cfg_comp) { + if (cur_cfg_comp && !cur_is_implicit_source) { add_cfg_comp(cfg, cur_cfg_comp, cur_cfg_comp_dest); } 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; } + cur_is_implicit_source = false; assert(cur_base_params); bt_put(cur_cfg_comp->params); - cur_cfg_comp->params = bt_get(cur_base_params); - cur_cfg_comp->begin_ns = cur_base_begin_ns; - cur_cfg_comp->end_ns = cur_base_end_ns; + cur_cfg_comp->params = bt_value_copy(cur_base_params); + if (!cur_cfg_comp->params) { + print_err_oom(); + goto end; + } + cur_cfg_comp_dest = BT_CONFIG_COMPONENT_DEST_SOURCE; - cur_cfg_comp_params_set = false; break; } case OPT_OUTPUT_FORMAT: @@ -2506,23 +2572,28 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) } /* Non-legacy: try to create a component config */ - if (cur_cfg_comp) { + if (cur_cfg_comp && !cur_is_implicit_source) { add_cfg_comp(cfg, cur_cfg_comp, cur_cfg_comp_dest); } 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; } + cur_is_implicit_source = false; 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->params) { + print_err_oom(); + goto end; + } + cur_cfg_comp_dest = BT_CONFIG_COMPONENT_DEST_SINK; - cur_cfg_comp_params_set = false; break; } case OPT_PARAMS: @@ -2531,14 +2602,8 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) struct bt_value *params_to_set; if (!cur_cfg_comp) { - printf_err("--params option must follow a --source or --sink option\n"); - goto error; - } - - if (cur_cfg_comp_params_set) { - printf_err("Duplicate --params option for the same current component (%s.%s)\n", - cur_cfg_comp->plugin_name->str, - cur_cfg_comp->component_name->str); + printf_err("Can not apply parameter to unavailable default source component \"%s\".\n", + DEFAULT_SOURCE_COMPONENT_NAME); goto error; } @@ -2549,19 +2614,33 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) goto error; } - params_to_set = bt_value_map_extend(cur_base_params, + params_to_set = bt_value_map_extend(cur_cfg_comp->params, params); BT_PUT(params); if (!params_to_set) { - printf_err("Cannot extend current base parameters with --params option's argument:\n %s\n", + printf_err("Cannot extend current component parameters with --params option's argument:\n %s\n", arg); goto error; } BT_MOVE(cur_cfg_comp->params, params_to_set); - cur_cfg_comp_params_set = true; break; } + case OPT_PATH: + if (!cur_cfg_comp) { + printf_err("Can not apply parameter to unavailable default source component \"%s\".\n", + DEFAULT_SOURCE_COMPONENT_NAME); + 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); @@ -2583,52 +2662,6 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) goto error; } break; - case OPT_BASE_BEGIN_NS: - if (ns_from_arg(arg, &cur_base_begin_ns)) { - printf_err("Invalid --base-begin-ns option's argument:\n %s\n", - arg); - goto error; - } - break; - case OPT_BASE_END_NS: - if (ns_from_arg(arg, &cur_base_end_ns)) { - printf_err("Invalid --base-end-ns option's argument:\n %s\n", - arg); - goto error; - } - break; - case OPT_RESET_BASE_BEGIN_NS: - cur_base_begin_ns = -1ULL; - break; - case OPT_RESET_BASE_END_NS: - cur_base_end_ns = -1ULL; - break; - case OPT_BEGIN_NS: - if (!cur_cfg_comp || cur_cfg_comp_dest == - BT_CONFIG_COMPONENT_DEST_SINK) { - printf_err("--begin-ns option must follow a --source option\n"); - goto error; - } - - if (ns_from_arg(arg, &cur_cfg_comp->begin_ns)) { - printf_err("Invalid --begin-ns option's argument:\n %s\n", - arg); - goto error; - } - break; - case OPT_END_NS: - if (!cur_cfg_comp || cur_cfg_comp_dest == - BT_CONFIG_COMPONENT_DEST_SINK) { - printf_err("--end-ns option must follow a --source option\n"); - goto error; - } - - if (ns_from_arg(arg, &cur_cfg_comp->end_ns)) { - printf_err("Invalid --end-ns option's argument:\n %s\n", - arg); - goto error; - } - break; case OPT_NAMES: if (text_legacy_opts.names) { printf_err("Duplicate --names option\n"); @@ -2711,16 +2744,74 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) case OPT_CLOCK_FORCE_CORRELATE: cfg->force_correlate = true; break; + case OPT_BEGIN: + if (!cur_cfg_comp) { + printf_err("Can not apply parameter to unavailable default source component \"%s\".\n", + DEFAULT_SOURCE_COMPONENT_NAME); + goto error; + } + if (cur_cfg_comp_dest != BT_CONFIG_COMPONENT_DEST_SOURCE) { + printf_err("--begin option must follow a --source option\n"); + goto error; + } + if (bt_value_map_insert_string(cur_cfg_comp->params, + "begin", arg)) { + print_err_oom(); + goto error; + } + break; + case OPT_END: + if (!cur_cfg_comp) { + printf_err("Can not apply parameter to unavailable default source component \"%s\".\n", + DEFAULT_SOURCE_COMPONENT_NAME); + goto error; + } + if (cur_cfg_comp_dest != BT_CONFIG_COMPONENT_DEST_SOURCE) { + printf_err("--end option must follow a --source option\n"); + goto error; + } + if (bt_value_map_insert_string(cur_cfg_comp->params, + "end", arg)) { + print_err_oom(); + goto error; + } + break; + case OPT_TIMERANGE: + { + const char *begin, *end; + + if (!cur_cfg_comp) { + printf_err("Can not apply parameter to unavailable default source component \"%s\".\n", + DEFAULT_SOURCE_COMPONENT_NAME); + goto error; + } + if (cur_cfg_comp_dest != BT_CONFIG_COMPONENT_DEST_SOURCE) { + printf_err("--timerange option must follow a --source option\n"); + goto error; + } + if (split_timerange(arg, &begin, &end)) { + printf_err("Invalid --timerange format, expecting: begin,end or [begin,end] (where [] are actual brackets)\n"); + goto error; + } + if (bt_value_map_insert_string(cur_cfg_comp->params, + "begin", begin)) { + print_err_oom(); + goto error; + } + if (bt_value_map_insert_string(cur_cfg_comp->params, + "end", end)) { + print_err_oom(); + goto error; + } + break; + } case OPT_HELP: - BT_PUT(cfg); print_usage(stdout); goto end; case OPT_HELP_LEGACY: - BT_PUT(cfg); print_legacy_usage(stdout); goto end; case OPT_VERSION: - BT_PUT(cfg); print_version(); goto end; case OPT_LIST: @@ -2742,10 +2833,9 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) arg = NULL; } - /* Append current component configuration, if any */ - if (cur_cfg_comp) { - add_cfg_comp(cfg, cur_cfg_comp, cur_cfg_comp_dest); - cur_cfg_comp = NULL; + if (argc <= 1) { + print_usage(stdout); + goto end; } /* Check for option parsing error */ @@ -2770,6 +2860,16 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) } } + if (append_home_and_system_plugin_paths(cfg)) { + goto error; + } + + /* Append current component configuration, if any */ + if (cur_cfg_comp && !cur_is_implicit_source) { + add_cfg_comp(cfg, cur_cfg_comp, cur_cfg_comp_dest); + } + cur_cfg_comp = NULL; + /* Validate legacy/non-legacy options */ if (!validate_cfg(cfg, &legacy_input_format, &legacy_output_format, legacy_input_paths, &ctf_legacy_opts, @@ -2785,11 +2885,28 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) if (legacy_input_format) { if (append_sources_from_legacy_opts(cfg->sources, 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"); + legacy_input_paths)) { + printf_err("Cannot convert legacy input format options to source component instance(s)\n"); + goto error; + } + if (append_sources_from_implicit_params(cfg->sources, + implicit_source_comp)) { + printf_err("Cannot initialize legacy component parameters\n"); goto error; } + use_implicit_source = false; + } else { + if (use_implicit_source) { + add_cfg_comp(cfg, implicit_source_comp, + BT_CONFIG_COMPONENT_DEST_SOURCE); + implicit_source_comp = NULL; + } else { + if (implicit_source_comp + && !bt_value_map_is_empty(implicit_source_comp->params)) { + printf_err("Arguments specified for implicit source, but an explicit source has been specified, overriding it\n"); + goto error; + } + } } /* @@ -2799,33 +2916,27 @@ 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; } } - for (i = 0; i < cfg->sources->len; i++) { - struct bt_config_component *cfg_component = - bt_config_get_component(cfg->sources, i); - - /* Only peek */ - bt_put(cfg_component); - - if (!validate_source_config_component(cfg_component)) { - printf_err("Invalid source component (%s.%s)\n", - cfg_component->plugin_name->str, - cfg_component->component_name->str); - goto error; + if (cfg->sinks->len == 0) { + /* Use implicit sink as default. */ + cur_cfg_comp = bt_config_component_from_arg(DEFAULT_SINK_COMPONENT_NAME); + if (!cur_cfg_comp) { + printf_error("Cannot find implicit sink plugin \"%s\"\n", + DEFAULT_SINK_COMPONENT_NAME); } + add_cfg_comp(cfg, cur_cfg_comp, + BT_CONFIG_COMPONENT_DEST_SINK); + cur_cfg_comp = NULL; } goto end; error: - BT_PUT(cfg); - cfg = NULL; - *exit_code = 1; - + ret = 1; end: if (pc) { poptFreeContext(pc); @@ -2844,10 +2955,11 @@ end: } free(arg); + BT_PUT(implicit_source_comp); BT_PUT(cur_cfg_comp); BT_PUT(cur_base_params); BT_PUT(text_legacy_opts.names); BT_PUT(text_legacy_opts.fields); BT_PUT(legacy_input_paths); - return cfg; + return ret; }