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;
}
/*
* Returns the parameters map value object from a command-line
- * source/sink option's argument. arg is the full argument, including
- * the plugin/component names, the optional colon, and the optional
- * parameters.
+ * parameter option's argument.
*
* Return value is owned by the caller.
*/
struct bt_value *bt_value_from_arg(const char *arg)
{
struct bt_value *params = NULL;
- const char *colon;
- const char *params_string;
GString *ini_error = NULL;
- /* Isolate parameters */
- colon = strchr(arg, ':');
- if (!colon) {
- /* No colon: empty parameters */
- params = bt_value_map_create();
- goto end;
- }
-
- params_string = colon + 1;
ini_error = g_string_new(NULL);
if (!ini_error) {
print_err_oom();
}
/* Try INI-style parsing */
- params = bt_value_from_ini(params_string, ini_error);
+ params = bt_value_from_ini(arg, ini_error);
if (!params) {
printf_err("%s", ini_error->str);
goto end;
/*
* Returns the plugin and component names from a command-line
- * source/sink option's argument. arg is the full argument, including
- * the plugin/component names, the optional colon, and the optional
- * parameters.
+ * source/sink option's argument. arg must have the following format:
+ *
+ * PLUGIN.COMPONENT
+ *
+ * where PLUGIN is the plugin name, and COMPONENT is the component
+ * name.
*
* On success, both *plugin and *component are not NULL. *plugin
* and *component are owned by the caller.
char **component)
{
const char *dot;
- const char *colon;
+ const char *end;
size_t plugin_len;
size_t component_len;
+ /* Initialize both return values to NULL: not found */
*plugin = NULL;
*component = NULL;
dot = strchr(arg, '.');
- if (!dot || dot == arg) {
+ if (!dot) {
+ /* No dot */
goto end;
}
- colon = strchr(dot, ':');
- if (colon == dot) {
- goto end;
- }
- if (!colon) {
- colon = arg + strlen(arg);
- }
-
+ end = arg + strlen(arg);
plugin_len = dot - arg;
- component_len = colon - dot - 1;
+ component_len = end - dot - 1;
if (plugin_len == 0 || component_len == 0) {
goto end;
}
- *plugin = malloc(plugin_len + 1);
+ *plugin = g_malloc0(plugin_len + 1);
if (!*plugin) {
print_err_oom();
goto end;
}
- (*plugin)[plugin_len] = '\0';
- memcpy(*plugin, arg, plugin_len);
- *component = malloc(component_len + 1);
+ g_strlcpy(*plugin, arg, plugin_len + 1);
+ *component = g_malloc0(component_len + 1);
if (!*component) {
print_err_oom();
goto end;
}
- (*component)[component_len] = '\0';
- memcpy(*component, dot + 1, component_len);
+ g_strlcpy(*component, dot + 1, component_len + 1);
end:
return;
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");
{
fprintf(fp, "Usage: babeltrace [OPTIONS]\n");
fprintf(fp, "\n");
- fprintf(fp, " -h --help Show this help\n");
- fprintf(fp, " --help-legacy Show Babeltrace 1.x legacy options\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, --plugin-path=PATH[:PATH]... Set paths from which dynamic plugins can be\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, " --plugin-path=PATH[:PATH]... Set paths from which dynamic plugins can be\n");
fprintf(fp, " loaded to PATH\n");
- fprintf(fp, " -i, --source=SOURCE Add source plugin/component SOURCE and its\n");
- fprintf(fp, " parameters to the active sources (may be\n");
- fprintf(fp, " repeated; see the exact format below)\n");
- fprintf(fp, " -o, --sink=SINK Add sink plugin/component SINK and its\n");
- fprintf(fp, " parameters to the active sinks (may be\n");
- fprintf(fp, " repeated; see the exact format below)\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");
+ fprintf(fp, " -o, --sink=PLUGIN.COMPCLS Instantiate a sink component from plugin\n");
+ fprintf(fp, " PLUGIN and component class COMPCLS (may be\n");
+ fprintf(fp, " repeated)\n");
+ 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, " -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");
fprintf(fp, " -V, --version Show version\n");
+ fprintf(fp, "\n\n");
+ fprintf(fp, "Format of PARAMS\n");
+ fprintf(fp, "----------------\n");
fprintf(fp, "\n");
- fprintf(fp, "SOURCE/SINK argument format:\n");
+ fprintf(fp, " PARAM=VALUE[,PARAM=VALUE]...\n");
fprintf(fp, "\n");
- fprintf(fp, " One of:\n");
+ fprintf(fp, "The parameter string is a comma-separated list of PARAM=VALUE assignments,\n");
+ fprintf(fp, "where PARAM is the parameter name (C identifier plus [:.-] characters), and\n");
+ fprintf(fp, "VALUE can be one of:\n");
fprintf(fp, "\n");
- fprintf(fp, " PLUGIN.COMPONENT\n");
- fprintf(fp, " Load component COMPONENT from plugin PLUGIN with its default parameters.\n");
+ fprintf(fp, "* `null`, `nul`, `NULL`: null value (no backticks).\n");
+ fprintf(fp, "* `true`, `TRUE`, `yes`, `YES`: true boolean value (no backticks).\n");
+ fprintf(fp, "* `false`, `FALSE`, `no`, `NO`: false boolean value (no backticks).\n");
+ fprintf(fp, "* Binary (`0b` prefix), octal (`0` prefix), decimal, or hexadecimal\n");
+ fprintf(fp, " (`0x` prefix) signed 64-bit integer.\n");
+ fprintf(fp, "* Double precision floating point number (scientific notation is accepted).\n");
+ 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, "\n");
- fprintf(fp, " PLUGIN.COMPONENT:PARAM=VALUE[,PARAM=VALUE]...\n");
- fprintf(fp, " Load component COMPONENT from plugin PLUGIN with the specified parameters.\n");
+ fprintf(fp, "Whitespaces are allowed around individual `=` and `,` tokens.\n");
fprintf(fp, "\n");
- fprintf(fp, " The parameter string is a comma-separated list of PARAM=VALUE assignments,\n");
- fprintf(fp, " where PARAM is the parameter name (C identifier plus [:.-] characters), and\n");
- fprintf(fp, " VALUE can be one of:\n");
+ fprintf(fp, "Example:\n");
fprintf(fp, "\n");
- fprintf(fp, " * \"null\", \"nul\", \"NULL\": null value (no double quotes)\n");
- fprintf(fp, " * \"true\", \"TRUE\", \"yes\", \"YES\": true boolean value (no double quotes)\n");
- fprintf(fp, " * \"false\", \"FALSE\", \"no\", \"NO\": false boolean value (no double quotes)\n");
- fprintf(fp, " * Binary (\"0b\" prefix), octal (\"0\" prefix), decimal, or\n");
- fprintf(fp, " hexadecimal (\"0x\" prefix) signed 64-bit integer\n");
- fprintf(fp, " * Double precision floating point number (scientific notation is accepted)\n");
- 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, " 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, "\n");
- fprintf(fp, " Example:\n");
- fprintf(fp, "\n");
- fprintf(fp, " plugin.comp: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, "IMPORTANT: Make sure to single-quote the whole argument when you run babeltrace\n");
+ fprintf(fp, "from a shell.\n");
}
/*
}
/*
- * Creates a component configuration using the given plugin name,
- * component name, and parameters. plugin_name and component_name
- * are copied (belong to the return value), and a reference to
- * params is acquired.
+ * Creates a component configuration using the given plugin name and
+ * component name. plugin_name and component_name are copied (belong to
+ * the return value).
*
* Return value is owned by the caller.
*/
static
struct bt_config_component *bt_config_component_create(const char *plugin_name,
- const char *component_name, struct bt_value *params)
+ const char *component_name)
{
struct bt_config_component *cfg_component = NULL;
goto error;
}
- cfg_component->params = bt_get(params);
+ /* Start with empty parameters */
+ cfg_component->params = bt_value_map_create();
+ if (!cfg_component->params) {
+ print_err_oom();
+ goto error;
+ }
+
+ /* Begin/end timestamp: not set */
+ cfg_component->begin_ns = -1ULL;
+ cfg_component->end_ns = -1ULL;
+
goto end;
error:
/*
* Creates a component configuration from a command-line source/sink
- * option's argument. arg is the full argument, including
- * the plugin/component names, the optional colon, and the optional
- * parameters.
+ * option's argument.
*/
static
struct bt_config_component *bt_config_component_from_arg(const char *arg)
struct bt_config_component *bt_config_component = NULL;
char *plugin_name;
char *component_name;
- struct bt_value *params = NULL;
plugin_component_names_from_arg(arg, &plugin_name, &component_name);
if (!plugin_name || !component_name) {
- printf_err("Cannot get plugin or component name\n");
- goto error;
- }
-
- params = bt_value_from_arg(arg);
- if (!params) {
- printf_err("Cannot parse parameters\n");
+ printf_err("Cannot get plugin or component class name\n");
goto error;
}
bt_config_component = bt_config_component_create(plugin_name,
- component_name, params);
+ component_name);
if (!bt_config_component) {
goto error;
}
BT_PUT(bt_config_component);
end:
- free(plugin_name);
- free(component_name);
- BT_PUT(params);
+ g_free(plugin_name);
+ g_free(component_name);
return bt_config_component;
}
goto error;
}
} else {
- printf_err("Unknown field name: \"%s\"\n",
+ printf_err("Unknown field name: `%s`\n",
identifier);
goto error;
}
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;
}
/*
goto error;
}
} else {
- printf_err("Unknown field name: \"%s\"\n",
+ printf_err("Unknown field name: `%s`\n",
identifier);
goto error;
}
/* Create a component configuration */
bt_config_component = bt_config_component_create(plugin_name,
- component_name, params);
+ component_name);
if (!bt_config_component) {
goto error;
}
+ BT_MOVE(bt_config_component->params, params);
+
/* Move created component configuration to the array */
g_ptr_array_add(sinks, bt_config_component);
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)
+ struct bt_value *legacy_input_paths,
+ uint64_t begin_ns, uint64_t end_ns)
{
int ret = 0;
int i;
/* Create a component configuration */
bt_config_component = bt_config_component_create("ctf",
- component_name, params);
+ component_name);
if (!bt_config_component) {
goto error;
}
+ 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);
/* Put current stuff */
BT_PUT(input_path);
BT_PUT(input_path_copy);
- BT_PUT(params);
}
goto end;
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 ");
text_legacy_opts_is_any_set(text_legacy_opts)) {
int ret;
- g_string_append(str, ":'");
+ g_string_append(str, " -p '");
if (g_string_append_string_path_param(str, "output-path",
text_legacy_opts->output)) {
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++) {
switch (legacy_input_format) {
case LEGACY_INPUT_FORMAT_CTF:
- g_string_append(str, "fs:'path=\"");
+ g_string_append(str, "fs -p 'path=\"");
break;
case LEGACY_INPUT_FORMAT_LTTNG_LIVE:
- g_string_append(str, "lttng-live:'url=\"");
+ g_string_append(str, "lttng-live -p 'url=\"");
break;
default:
assert(false);
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
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);
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;
}
*/
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;
}
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_CLOCK_CYCLES,
OPT_CLOCK_DATE,
OPT_CLOCK_FORCE_CORRELATE,
OPT_DEBUG_INFO_DIR,
OPT_DEBUG_INFO_FULL_PATH,
OPT_DEBUG_INFO_TARGET_PREFIX,
+ OPT_END_NS,
OPT_FIELDS,
OPT_HELP,
OPT_HELP_LEGACY,
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,
/* 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 },
{ "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 },
{ "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 },
{ "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 },
{ "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 },
- { "plugin-path", 'p', POPT_ARG_STRING, NULL, OPT_PLUGIN_PATH, NULL, NULL },
+ { "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 },
offset_opt->is_set = true;
}
+enum bt_config_component_dest {
+ BT_CONFIG_COMPONENT_DEST_SOURCE,
+ BT_CONFIG_COMPONENT_DEST_SINK,
+};
+
+/*
+ * Adds a configuration component to the appropriate configuration
+ * array depending on the destination.
+ */
+static void add_cfg_comp(struct bt_config *cfg,
+ struct bt_config_component *cfg_comp,
+ enum bt_config_component_dest dest)
+{
+ if (dest == BT_CONFIG_COMPONENT_DEST_SOURCE) {
+ g_ptr_array_add(cfg->sources, cfg_comp);
+ } else {
+ g_ptr_array_add(cfg->sinks, cfg_comp);
+ }
+}
+
/*
* Returns a Babeltrace configuration, out of command-line arguments,
* containing everything that is needed to instanciate specific
enum legacy_output_format legacy_output_format =
LEGACY_OUTPUT_FORMAT_NONE;
struct bt_value *legacy_input_paths = NULL;
+ struct bt_config_component *cur_cfg_comp = NULL;
+ 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;
*exit_code = 0;
goto error;
}
+ cur_base_params = bt_value_map_create();
+ if (!cur_base_params) {
+ print_err_oom();
+ goto error;
+ }
+
/* Create config */
cfg = g_new0(struct bt_config, 1);
if (!cfg) {
case OPT_INPUT_FORMAT:
case OPT_SOURCE:
{
- struct bt_config_component *bt_config_component;
-
if (opt == OPT_INPUT_FORMAT) {
if (!strcmp(arg, "ctf")) {
/* Legacy CTF input format */
}
/* Non-legacy: try to create a component config */
- bt_config_component = bt_config_component_from_arg(arg);
- if (!bt_config_component) {
- printf_err("Invalid source component format:\n %s\n",
+ if (cur_cfg_comp) {
+ 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 format for --source option's argument:\n %s\n",
arg);
goto error;
}
- g_ptr_array_add(cfg->sources, bt_config_component);
+ assert(cur_base_params);
+ bt_put(cur_cfg_comp->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;
+ cur_cfg_comp_params_set = false;
break;
}
case OPT_OUTPUT_FORMAT:
case OPT_SINK:
{
- struct bt_config_component *bt_config_component;
-
if (opt == OPT_OUTPUT_FORMAT) {
if (!strcmp(arg, "text")) {
/* Legacy CTF-text output format */
}
/* Non-legacy: try to create a component config */
- bt_config_component = bt_config_component_from_arg(arg);
- if (!bt_config_component) {
- printf_err("Invalid sink component format:\n %s\n",
+ if (cur_cfg_comp) {
+ 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 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_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;
+ }
+ case OPT_PARAMS:
+ {
+ struct bt_value *params;
+ 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);
+ goto error;
+ }
+
+ params = bt_value_from_arg(arg);
+ if (!params) {
+ printf_err("Invalid format for --params option's argument:\n %s\n",
+ arg);
+ goto error;
+ }
+
+ params_to_set = bt_value_map_extend(cur_base_params,
+ params);
+ BT_PUT(params);
+ if (!params_to_set) {
+ printf_err("Cannot extend current base 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");
+ 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);
+
+ if (!params) {
+ printf_err("Invalid format for --base-params option's argument:\n %s\n",
arg);
goto error;
}
- g_ptr_array_add(cfg->sinks, bt_config_component);
+ BT_MOVE(cur_base_params, params);
break;
}
+ case OPT_RESET_BASE_PARAMS:
+ BT_PUT(cur_base_params);
+ cur_base_params = bt_value_map_create();
+ if (!cur_base_params) {
+ print_err_oom();
+ 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");
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;
+ }
+
/* Check for option parsing error */
if (opt < -1) {
printf_err("While parsing command-line options, at option %s: %s\n",
if (legacy_input_format) {
if (append_sources_from_legacy_opts(cfg->sources,
legacy_input_format, &ctf_legacy_opts,
- legacy_input_paths)) {
- printf_err("Cannot convert legacy input format options to source(s)\n");
+ legacy_input_paths, cur_base_begin_ns,
+ cur_base_end_ns)) {
+ printf_err("Cannot convert legacy input format options to source component instance(s)\n");
goto error;
}
}
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 instance (class %s.%s)\n",
+ cfg_component->plugin_name->str,
+ cfg_component->component_name->str);
goto error;
}
}
}
free(arg);
+ 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);
projects / babeltrace.git / blobdiff