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, " --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");
goto error;
}
- /* Begin/end timestamp: not set */
- cfg_component->begin_ns = -1ULL;
- cfg_component->end_ns = -1ULL;
-
goto end;
error:
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;
}
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)
+ int64_t *begin_ns, int64_t *end_ns)
{
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;
+ 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);
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++) {
{
bool valid = false;
- if (cfg_comp->begin_ns != -1ULL && cfg_comp->end_ns != -1ULL) {
- if (cfg_comp->begin_ns > cfg_comp->end_ns) {
+ 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_ns, cfg_comp->end_ns);
+ cfg_comp->begin.value_ns,
+ cfg_comp->end.value_ns);
goto end;
}
}
* Returns a negative value if anything goes wrong.
*/
static
-int ns_from_arg(const char *arg, uint64_t *ns)
+int ns_from_arg(const char *arg, int64_t *ns)
{
int ret = 0;
int64_t value;
goto end;
}
- *ns = (uint64_t) value;
+ *ns = value;
end:
return ret;
OPT_NO_DELTA,
OPT_OUTPUT_FORMAT,
OPT_OUTPUT_PATH,
+ OPT_PATH,
OPT_PARAMS,
OPT_PLUGIN_PATH,
OPT_RESET_BASE_BEGIN_NS,
{ "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-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 },
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;
+ 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;
+ memset(&ctf_legacy_opts, 0, sizeof(ctf_legacy_opts));
+ memset(&text_legacy_opts, 0, sizeof(text_legacy_opts));
*exit_code = 0;
if (argc <= 1) {
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;
}
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->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;
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;
}
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;
}
if (cur_cfg_comp_params_set) {
- printf_err("Duplicate --params option for the same current component (%s.%s)\n",
+ 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;
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);
arg);
goto error;
}
+ cur_base_begin_ns_set = true;
break;
case OPT_BASE_END_NS:
if (ns_from_arg(arg, &cur_base_end_ns)) {
arg);
goto error;
}
+ cur_base_end_ns_set = true;
break;
case OPT_RESET_BASE_BEGIN_NS:
- cur_base_begin_ns = -1ULL;
+ cur_base_begin_ns = 0;
+ cur_base_begin_ns = false;
break;
case OPT_RESET_BASE_END_NS:
- cur_base_end_ns = -1ULL;
+ cur_base_end_ns = 0;
+ cur_base_end_ns = false;
break;
case OPT_BEGIN_NS:
if (!cur_cfg_comp || cur_cfg_comp_dest ==
goto error;
}
- if (ns_from_arg(arg, &cur_cfg_comp->begin_ns)) {
+ 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 ==
goto error;
}
- if (ns_from_arg(arg, &cur_cfg_comp->end_ns)) {
+ 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) {
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,
+ cur_base_begin_ns_set ? &cur_base_begin_ns : NULL,
+ cur_base_end_ns_set ? &cur_base_end_ns : NULL)) {
+ 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;
}
}
bt_put(cfg_component);
if (!validate_source_config_component(cfg_component)) {
- printf_err("Invalid source component (%s.%s)\n",
+ printf_err("Invalid source component instance (class %s.%s)\n",
cfg_component->plugin_name->str,
cfg_component->component_name->str);
goto error;