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");
case OPT_DEBUG:
babeltrace_debug = 1;
break;
+ case OPT_NO_DELTA:
+ opt_delta = 0;
+ break;
default:
ret = -EINVAL;
goto end;
opt_trace_domain,
opt_trace_procname,
opt_trace_vpid,
- opt_loglevel;
+ opt_loglevel,
+ opt_delta = 1;
enum field_item {
ITEM_SCOPE,
else
fprintf(pos->fp, " ");
}
+ if (opt_delta && stream->has_timestamp) {
+ uint64_t delta, delta_sec, delta_nsec;
+
+ set_field_names_print(pos, ITEM_HEADER);
+ if (pos->print_names)
+ fprintf(pos->fp, "delta = ");
+ else
+ fprintf(pos->fp, "(");
+ if (pos->last_timestamp != -1ULL) {
+ delta = stream->timestamp - pos->last_timestamp;
+ delta_sec = delta / NSEC_PER_SEC;
+ delta_nsec = delta % NSEC_PER_SEC;
+ fprintf(pos->fp, "+%" PRIu64 ".%09" PRIu64,
+ delta_sec, delta_nsec);
+ } else {
+ fprintf(pos->fp, "+?.?????????");
+ }
+ if (!pos->print_names)
+ fprintf(pos->fp, ")");
+
+ if (pos->print_names)
+ fprintf(pos->fp, ", ");
+ else
+ fprintf(pos->fp, " ");
+ pos->last_timestamp = stream->timestamp;
+ }
+
if ((opt_trace_name || opt_all_field_names) && stream_class->trace->path[0] != '\0') {
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
pos = g_new0(struct ctf_text_stream_pos, 1);
+ pos->last_timestamp = -1ULL;
switch (flags & O_ACCMODE) {
case O_RDWR:
if (!path)