stream_pos->offset = saved_pos->offset;
stream_pos->last_offset = LAST_OFFSET_POISON;
- stream->prev_real_timestamp = 0;
- stream->prev_real_timestamp_end = 0;
- stream->prev_cycles_timestamp = 0;
- stream->prev_cycles_timestamp_end = 0;
+ stream->current.real.begin = 0;
+ stream->current.real.end = 0;
+ stream->current.cycles.begin = 0;
+ stream->current.cycles.end = 0;
+
+ stream->prev.real.begin = 0;
+ stream->prev.real.end = 0;
+ stream->prev.cycles.begin = 0;
+ stream->prev.cycles.end = 0;
printf_debug("restored to cur_index = %" PRId64 " and "
"offset = %" PRId64 ", timestamp = %" PRIu64 "\n",
return ret;
}
+int bt_iter_add_trace(struct bt_iter *iter,
+ struct bt_trace_descriptor *td_read)
+{
+ struct ctf_trace *tin;
+ int stream_id, ret = 0;
+
+ tin = container_of(td_read, struct ctf_trace, parent);
+
+ /* Populate heap with each stream */
+ for (stream_id = 0; stream_id < tin->streams->len;
+ stream_id++) {
+ struct ctf_stream_declaration *stream;
+ int filenr;
+
+ stream = g_ptr_array_index(tin->streams, stream_id);
+ if (!stream)
+ continue;
+ for (filenr = 0; filenr < stream->streams->len;
+ filenr++) {
+ struct ctf_file_stream *file_stream;
+ struct bt_iter_pos pos;
+
+ file_stream = g_ptr_array_index(stream->streams,
+ filenr);
+ if (!file_stream)
+ continue;
+
+ pos.type = BT_SEEK_BEGIN;
+ ret = babeltrace_filestream_seek(file_stream,
+ &pos, stream_id);
+
+ if (ret == EOF) {
+ ret = 0;
+ continue;
+ } else if (ret != 0 && ret != EAGAIN) {
+ goto error;
+ }
+ /* Add to heap */
+ ret = bt_heap_insert(iter->stream_heap, file_stream);
+ if (ret)
+ goto error;
+ }
+ }
+
+error:
+ return ret;
+}
+
int bt_iter_init(struct bt_iter *iter,
struct bt_context *ctx,
const struct bt_iter_pos *begin_pos,
const struct bt_iter_pos *end_pos)
{
- int i, stream_id;
+ int i;
int ret = 0;
- if (!iter || !ctx)
+ if (!iter || !ctx || !ctx->tc || !ctx->tc->array)
return -EINVAL;
if (ctx->current_iterator) {
goto error_heap_init;
for (i = 0; i < ctx->tc->array->len; i++) {
- struct ctf_trace *tin;
struct bt_trace_descriptor *td_read;
td_read = g_ptr_array_index(ctx->tc->array, i);
if (!td_read)
continue;
- tin = container_of(td_read, struct ctf_trace, parent);
-
- /* Populate heap with each stream */
- for (stream_id = 0; stream_id < tin->streams->len;
- stream_id++) {
- struct ctf_stream_declaration *stream;
- int filenr;
-
- stream = g_ptr_array_index(tin->streams, stream_id);
- if (!stream)
- continue;
- for (filenr = 0; filenr < stream->streams->len;
- filenr++) {
- struct ctf_file_stream *file_stream;
- struct bt_iter_pos pos;
-
- file_stream = g_ptr_array_index(stream->streams,
- filenr);
- if (!file_stream)
- continue;
-
- pos.type = BT_SEEK_BEGIN;
- ret = babeltrace_filestream_seek(file_stream,
- &pos, stream_id);
-
- if (ret == EOF) {
- ret = 0;
- continue;
- } else if (ret != 0 && ret != EAGAIN) {
- goto error;
- }
- /* Add to heap */
- ret = bt_heap_insert(iter->stream_heap, file_stream);
- if (ret)
- goto error;
- }
- }
+ ret = bt_iter_add_trace(iter, td_read);
+ if (ret < 0)
+ goto error;
}
ctx->current_iterator = iter;