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, " (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, " -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");
fprintf(fp, " -p, --params=PARAMS Set the parameters of the latest source or\n");
fprintf(fp, " sink component instance (in command-line \n");
fprintf(fp, " order) to PARAMS (see the exact format of\n");
fprintf(fp, " PARAMS below)\n");
- fprintf(fp, " -P, --plugin-path=PATH[:PATH]... Set paths from which dynamic plugins can be\n");
+ fprintf(fp, " --plugin-path=PATH[:PATH]... Set paths from which dynamic plugins can be\n");
fprintf(fp, " loaded to PATH\n");
- fprintf(fp, " --reset-base-begin-ns Reset the current base beginning timestamp\n");
- fprintf(fp, " of the following source component instances\n");
- 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");
goto error;
}
- /* Begin/end timestamp: not set */
- cfg_component->begin_ns = -1ULL;
- cfg_component->end_ns = -1ULL;
-
goto end;
error:
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;
}
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);
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
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,
/* 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 },
+ { "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 },
*
* 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;
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;
+ memset(&ctf_legacy_opts, 0, sizeof(ctf_legacy_opts));
+ memset(&text_legacy_opts, 0, sizeof(text_legacy_opts));
*exit_code = 0;
if (argc <= 1) {
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) {
+ print_err_oom();
+ goto end;
+ }
+
cur_cfg_comp_dest = BT_CONFIG_COMPONENT_DEST_SOURCE;
cur_cfg_comp_params_set = false;
break;
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;
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);
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");
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)) {
+ legacy_input_paths)) {
printf_err("Cannot convert legacy input format options to source 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;
- }
- }
-
goto end;
error:
projects / babeltrace.git / blobdiff