#include <glib.h>
#include "babeltrace-cfg.h"
+#define DEFAULT_SOURCE_COMPONENT_NAME "ctf.fs"
+
/*
* Error printf() macro which prepends "Error: " the first time it's
* called. This gives a nicer feel than having a bunch of error prefixes
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;
}
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");
fprintf(fp, " instances (see the exact format of PARAMS\n");
fprintf(fp, " below)\n");
fprintf(fp, " -d, --debug Enable debug mode\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, " -l, --list List available plugins and their components\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, " -P, --plugin-path=PATH[:PATH]... Set paths from which dynamic plugins can be\n");
- fprintf(fp, " loaded to PATH\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, " -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, " --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, " -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");
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;
}
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;
}
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 ");
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++) {
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;
}
enum {
OPT_NONE = 0,
OPT_BASE_PARAMS,
+ OPT_BEGIN,
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,
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_PARAMS,
OPT_SINK,
OPT_SOURCE,
OPT_STREAM_INTERSECTION,
+ OPT_TIMERANGE,
OPT_VERBOSE,
OPT_VERSION,
};
static struct poptOption long_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
{ "base-params", 'b', POPT_ARG_STRING, NULL, OPT_BASE_PARAMS, 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 },
{ "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", '\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 },
{ "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-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 },
{ NULL, 0, 0, NULL, 0, NULL, NULL },
}
}
+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;
+}
+
/*
* Returns a Babeltrace configuration, out of command-line arguments,
* containing everything that is needed to instanciate specific
*
* Return value is NULL on error, otherwise it's owned by the caller.
*/
-struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code)
+struct bt_config *bt_config_from_args(int argc, const char *argv[], int *exit_code)
{
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;
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;
int opt;
- bool cur_cfg_comp_params_set = false;
+ memset(&ctf_legacy_opts, 0, sizeof(ctf_legacy_opts));
+ memset(&text_legacy_opts, 0, sizeof(text_legacy_opts));
*exit_code = 0;
if (argc <= 1) {
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) {
}
}
+ 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->params = bt_value_copy(cur_base_params);
+ if (!cur_cfg_comp) {
+ 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:
}
/* 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) {
+ 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_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;
}
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);
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);
}
/* Append current component configuration, if any */
- 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 = NULL;
+ }
+ cur_cfg_comp = NULL;
+
+ 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;
+ }
}
/* Check for option parsing error */
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");
+ 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;
}
}
}
free(arg);
+ BT_PUT(implicit_source_comp);
BT_PUT(cur_cfg_comp);
BT_PUT(cur_base_params);
BT_PUT(text_legacy_opts.names);
projects / babeltrace.git / blobdiff