*/
static GPtrArray *opt_input_paths;
static char *opt_output_path;
+int opt_stream_intersection;
static struct bt_format *fmt_read;
OPT_CLOCK_DATE,
OPT_CLOCK_GMT,
OPT_CLOCK_FORCE_CORRELATE,
+ OPT_STREAM_INTERSECTION,
};
/*
{ "clock-date", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_DATE, NULL, NULL },
{ "clock-gmt", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_GMT, NULL, NULL },
{ "clock-force-correlate", 0, POPT_ARG_NONE, NULL, OPT_CLOCK_FORCE_CORRELATE, NULL, NULL },
+ { "stream-intersection", 0, POPT_ARG_NONE, NULL, OPT_STREAM_INTERSECTION, NULL, NULL },
{ NULL, 0, 0, NULL, 0, NULL, NULL },
};
fprintf(fp, " --clock-gmt Print clock in GMT time zone (default: local time zone)\n");
fprintf(fp, " --clock-force-correlate Assume that clocks are inherently correlated\n");
fprintf(fp, " across traces.\n");
+ fprintf(fp, " --stream-intersection Only print events when all streams are active.\n");
list_formats(fp);
fprintf(fp, "\n");
}
case OPT_CLOCK_FORCE_CORRELATE:
opt_clock_force_correlate = 1;
break;
+ case OPT_STREAM_INTERSECTION:
+ opt_stream_intersection = 1;
+ break;
default:
ret = -EINVAL;
return ret;
}
+static
+struct bt_ctf_iter *iter_create_intersect(struct bt_context *ctx,
+ struct bt_iter_pos **inter_begin_pos,
+ struct bt_iter_pos **inter_end_pos)
+{
+ uint64_t begin = 0, end = ULLONG_MAX;
+ int ret;
+
+ ret = ctf_find_packets_intersection(ctx, &begin, &end);
+ if (ret == 1) {
+ fprintf(stderr, "[error] No intersection found between trace files.\n");
+ ret = -1;
+ goto error;
+ } else if (ret != 0) {
+ goto error;
+ }
+ *inter_begin_pos = bt_iter_create_time_pos(NULL, begin);
+ if (!(*inter_begin_pos)) {
+ goto error;
+ }
+ *inter_end_pos = bt_iter_create_time_pos(NULL, end);
+ if (!(*inter_end_pos)) {
+ goto error;
+ }
+
+ /*
+ * bt_ctf_iter does not take ownership of begin and end positions,
+ * so we return them to the caller who must still assume their ownership
+ * until the iterator is destroyed.
+ */
+ return bt_ctf_iter_create(ctx, *inter_begin_pos,
+ *inter_end_pos);
+error:
+ return NULL;
+}
+
static
int convert_trace(struct bt_trace_descriptor *td_write,
struct bt_context *ctx)
{
struct bt_ctf_iter *iter;
struct ctf_text_stream_pos *sout;
- struct bt_iter_pos begin_pos;
+ struct bt_iter_pos *begin_pos = NULL, *end_pos = NULL;
struct bt_ctf_event *ctf_event;
int ret;
sout = container_of(td_write, struct ctf_text_stream_pos,
trace_descriptor);
- if (!sout->parent.event_cb)
+ if (!sout->parent.event_cb) {
return 0;
+ }
- begin_pos.type = BT_SEEK_BEGIN;
- iter = bt_ctf_iter_create(ctx, &begin_pos, NULL);
+ if (opt_stream_intersection) {
+ iter = iter_create_intersect(ctx, &begin_pos, &end_pos);
+ } else {
+ begin_pos = bt_iter_create_time_pos(NULL, 0);
+ begin_pos->type = BT_SEEK_BEGIN;
+ iter = bt_ctf_iter_create(ctx, begin_pos, NULL);
+ }
if (!iter) {
ret = -1;
goto error_iter;
goto end;
}
ret = bt_iter_next(bt_ctf_get_iter(iter));
- if (ret < 0)
+ if (ret < 0) {
goto end;
+ }
}
ret = 0;
end:
bt_ctf_iter_destroy(iter);
error_iter:
+ bt_iter_free_pos(begin_pos);
+ bt_iter_free_pos(end_pos);
return ret;
}