int i, stream_id;
int ret = 0;
+ if (ctx->current_iterator) {
+ ret = -1;
+ goto error_ctx;
+ }
+
iter->stream_heap = g_new(struct ptr_heap, 1);
iter->end_pos = end_pos;
bt_context_get(ctx);
filenr);
if (begin_pos) {
- ret = babeltrace_filestream_seek(file_stream, begin_pos,
+ ret = babeltrace_filestream_seek(
+ file_stream,
+ begin_pos,
+ stream_id);
+ } else {
+ struct bt_iter_pos pos;
+ pos.type = BT_SEEK_BEGIN;
+ ret = babeltrace_filestream_seek(
+ file_stream, &pos,
stream_id);
- if (ret == EOF) {
- ret = 0;
- continue;
- } else if (ret) {
- goto error;
- }
+ }
+ if (ret == EOF) {
+ ret = 0;
+ continue;
+ } else if (ret) {
+ goto error;
}
/* Add to heap */
ret = heap_insert(iter->stream_heap, file_stream);
}
}
+ ctx->current_iterator = iter;
return 0;
error:
heap_free(iter->stream_heap);
error_heap_init:
g_free(iter->stream_heap);
+error_ctx:
return ret;
}
heap_free(iter->stream_heap);
g_free(iter->stream_heap);
}
+ iter->ctx->current_iterator = NULL;
bt_context_put(iter->ctx);
}