OPT_VERBOSE,
OPT_DEBUG,
OPT_NAMES,
+ OPT_NO_DELTA,
};
static struct poptOption long_options[] = {
{ "verbose", 'v', POPT_ARG_NONE, NULL, OPT_VERBOSE, NULL, NULL },
{ "debug", 'd', POPT_ARG_NONE, NULL, OPT_DEBUG, NULL, NULL },
{ "names", 'n', POPT_ARG_STRING, NULL, OPT_NAMES, NULL, NULL },
+ { "no-delta", 0, POPT_ARG_NONE, NULL, OPT_NO_DELTA, NULL, NULL },
{ NULL, 0, 0, NULL, 0, NULL, NULL },
};
fprintf(fp, " (or set BABELTRACE_VERBOSE environment variable)\n");
fprintf(fp, " -d, --debug Debug mode\n");
fprintf(fp, " (or set BABELTRACE_DEBUG environment variable)\n");
+ fprintf(fp, " --no-delta Do not print time delta between consecutive events\n");
fprintf(fp, " -n, --names name1<,name2,...> Print field names.\n");
fprintf(fp, " Available field names:\n");
- fprintf(fp, " payload OR args OR arg\n");
- fprintf(fp, " all, scope, header, context OR ctx\n");
+ fprintf(fp, " (payload OR args OR arg)\n");
+ fprintf(fp, " all, scope, header, (context OR ctx)\n");
+ fprintf(fp, " trace, trace:domain, trace:procname, trace:vpid,\n");
+ fprintf(fp, " loglevel.\n");
fprintf(fp, " (payload active by default)\n");
list_formats(fp);
fprintf(fp, "\n");
opt_header_field_names = 1;
else if (!strcmp(str, "payload") || !strcmp(str, "args") || !strcmp(str, "arg"))
opt_payload_field_names = 1;
+ else if (!strcmp(str, "trace"))
+ opt_trace_name = 1;
+ else if (!strcmp(str, "trace:domain"))
+ opt_trace_domain = 1;
+ else if (!strcmp(str, "trace:procname"))
+ opt_trace_procname = 1;
+ else if (!strcmp(str, "trace:vpid"))
+ opt_trace_vpid = 1;
+ else if (!strcmp(str, "loglevel"))
+ opt_loglevel = 1;
else {
fprintf(stdout, "[error] unknown field name type %s\n", str);
return -EINVAL;
case OPT_DEBUG:
babeltrace_debug = 1;
break;
+ case OPT_NO_DELTA:
+ opt_delta = 0;
+ break;
default:
ret = -EINVAL;
goto end;
} else {
close(fd);
close(dirfd);
- td_read = fmt_read->open_trace(fpath, O_RDONLY, ctf_move_pos_slow,
+ td_read = fmt_read->open_trace(opt_input_path,
+ fpath, O_RDONLY, ctf_move_pos_slow,
NULL);
if (!td_read) {
fprintf(stdout, "Error opening trace \"%s\" "
return 0;
}
- td_write = fmt_write->open_trace(opt_output_path, O_RDWR, NULL, NULL);
+ td_write = fmt_write->open_trace(NULL, opt_output_path, O_RDWR, NULL, NULL);
if (!td_write) {
fprintf(stdout, "Error opening trace \"%s\" for writing.\n\n",
opt_output_path ? : "<none>");