X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=converter%2Fbabeltrace-cfg.c;h=608b65484df49c06490a7c3ea23795607a9650a3;hb=1670bffdf312795f277237062cca264967f13fd0;hp=76624b2b8da36b2da3b9881249bb6ea0144e4f00;hpb=8ff0b83054fe937e30046724d32a45bc297a3226;p=babeltrace.git diff --git a/converter/babeltrace-cfg.c b/converter/babeltrace-cfg.c index 76624b2b..608b6548 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 @@ -722,7 +728,7 @@ 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"); @@ -754,20 +760,11 @@ 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, " -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, " -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"); @@ -777,10 +774,6 @@ void print_usage(FILE *fp) fprintf(fp, " PARAMS below)\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"); - fprintf(fp, " --reset-base-end-ns Reset the current base end timestamp of the\n"); - fprintf(fp, " following source component instances\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"); @@ -790,6 +783,11 @@ 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, " --begin Start time: [YYYY-MM-DD [hh:mm:]]ss[.nnnnnnnnn]\n"); + fprintf(fp, " --end End time: [YYYY-MM-DD [hh:mm:]]ss[.nnnnnnnnn]\n"); + fprintf(fp, " --timerange Time range: begin,end or [begin,end] (where [] are actual brackets)\n"); + fprintf(fp, " --omit-system-plugin-path Omit system plugins from plugin search path\n"); + fprintf(fp, " --omit-home-plugin-path Omit home plugins from plugin search path\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"); @@ -964,6 +962,17 @@ end: return; } +static +bool is_setuid_setgid(void) +{ + return (geteuid() != getuid() || getegid() != getgid()); +} + +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. @@ -973,59 +982,34 @@ end: * Return value is owned by the caller. */ static -struct bt_value *plugin_paths_from_arg(const char *arg) +enum bt_value_status plugin_paths_from_arg(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; } /* @@ -1580,8 +1564,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, - int64_t *begin_ns, int64_t *end_ns) + struct bt_value *legacy_input_paths) { int ret = 0; int i; @@ -1646,10 +1629,6 @@ int append_sources_from_legacy_opts(GPtrArray *sources, } BT_MOVE(bt_config_component->params, params); - bt_config_component->begin.value_ns = begin_ns ? *begin_ns : 0; - bt_config_component->begin.set = !!begin_ns; - bt_config_component->end.value_ns = end_ns ? *end_ns : 0; - bt_config_component->end.set = !!end_ns; /* Move created component configuration to the array */ g_ptr_array_add(sources, bt_config_component); @@ -1998,29 +1977,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.set && cfg_comp->end.set) { - if (cfg_comp->begin.value_ns > cfg_comp->end.value_ns) { - printf_err("Beginning timestamp (%" PRIu64 ") is greater than end timestamp (%" PRIu64 ")\n", - cfg_comp->begin.value_ns, - cfg_comp->end.value_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 +1997,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; } @@ -2145,40 +2099,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, int64_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 = 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 +2115,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, @@ -2203,23 +2128,22 @@ enum { 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 }, @@ -2231,7 +2155,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 }, @@ -2244,14 +2168,15 @@ static struct poptOption long_options[] = { { "path", 'P', POPT_ARG_STRING, NULL, OPT_PATH, NULL, NULL }, { "params", 'p', POPT_ARG_STRING, NULL, OPT_PARAMS, 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 }, { "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 }, }; @@ -2284,47 +2209,163 @@ 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_internal_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."); + } else { + char *home_plugin_dir = + bt_common_get_home_plugin_path(); + + if (home_plugin_dir) { + ret = plugin_paths_from_arg(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 (plugin_paths_from_arg(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. - * - * 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; 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; - int64_t cur_base_begin_ns = 0; - bool cur_base_begin_ns_set = false; - int64_t cur_base_end_ns = 0; - bool cur_base_end_ns_set = false; - int opt; - bool cur_cfg_comp_params_set = false; - unsigned int i; + int opt, ret = 0; memset(&ctf_legacy_opts, 0, sizeof(ctf_legacy_opts)); memset(&text_legacy_opts, 0, sizeof(text_legacy_opts)); - *exit_code = 0; - - if (argc <= 1) { - print_usage(stdout); - goto end; - } text_legacy_opts.output = g_string_new(NULL); if (!text_legacy_opts.output) { @@ -2350,32 +2391,23 @@ 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) { - 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; - } - 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 */ pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 0); if (!pc) { @@ -2390,17 +2422,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 (is_setuid_setgid()) { + printf_debug("Skipping non-system plugin paths for setuid/setgid binary."); + } else { + if (plugin_paths_from_arg(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"); @@ -2452,8 +2488,10 @@ 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); } @@ -2464,23 +2502,17 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) arg); goto error; } + cur_is_implicit_source = false; assert(cur_base_params); bt_put(cur_cfg_comp->params); cur_cfg_comp->params = bt_value_copy(cur_base_params); - if (!cur_cfg_comp) { + if (!cur_cfg_comp->params) { print_err_oom(); goto end; } - cur_cfg_comp->begin.value_ns = cur_base_begin_ns; - cur_cfg_comp->begin.set = cur_base_begin_ns_set; - - cur_cfg_comp->end.value_ns = cur_base_end_ns; - cur_cfg_comp->end.set = cur_base_end_ns_set; - cur_cfg_comp_dest = BT_CONFIG_COMPONENT_DEST_SOURCE; - cur_cfg_comp_params_set = false; break; } case OPT_OUTPUT_FORMAT: @@ -2521,7 +2553,7 @@ 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); } @@ -2532,17 +2564,17 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) arg); goto error; } + cur_is_implicit_source = false; assert(cur_base_params); bt_put(cur_cfg_comp->params); cur_cfg_comp->params = bt_value_copy(cur_base_params); - if (!cur_cfg_comp) { + 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: @@ -2551,14 +2583,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\ninstance (class %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; } @@ -2569,22 +2595,22 @@ 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("--path option must follow a --source or --sink option\n"); + printf_err("Can not apply parameter to unavailable default source component \"%s\".\n", + DEFAULT_SOURCE_COMPONENT_NAME); goto error; } @@ -2617,58 +2643,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; - } - cur_base_begin_ns_set = true; - 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; - } - cur_base_end_ns_set = true; - break; - case OPT_RESET_BASE_BEGIN_NS: - cur_base_begin_ns = 0; - cur_base_begin_ns = false; - break; - case OPT_RESET_BASE_END_NS: - cur_base_end_ns = 0; - cur_base_end_ns = false; - 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.value_ns)) { - printf_err("Invalid --begin-ns option's argument:\n %s\n", - arg); - goto error; - } - cur_cfg_comp->begin.set = true; - 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.value_ns)) { - printf_err("Invalid --end-ns option's argument:\n %s\n", - arg); - goto error; - } - cur_cfg_comp->end.set = true; - break; case OPT_NAMES: if (text_legacy_opts.names) { printf_err("Duplicate --names option\n"); @@ -2751,16 +2725,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: @@ -2782,10 +2814,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 */ @@ -2810,6 +2841,16 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) } } + if (add_internal_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, @@ -2825,12 +2866,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_set ? &cur_base_begin_ns : NULL, - cur_base_end_ns_set ? &cur_base_end_ns : NULL)) { + 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; + } + } } /* @@ -2845,28 +2902,22 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) } } - 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 instance (class %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); @@ -2885,10 +2936,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; }