Fix: Take the iterator's end position into account

[babeltrace.git] / formats / ctf / iterator.c

diff --git a/formats/ctf/iterator.c b/formats/ctf/iterator.c
index 0534d013acc601220dd41986aea26805a7169d88..d1152fcaf86852e418d09efed280ae611606adf3 100644 (file)
--- a/formats/ctf/iterator.c
+++ b/formats/ctf/iterator.c
@@ -120,12 +120,17 @@ struct bt_ctf_event *bt_ctf_iter_read_event_flags(struct bt_ctf_iter *iter,
        assert(iter);
 
        ret = &iter->current_ctf_event;
-       file_stream = heap_maximum(iter->parent.stream_heap);
+       file_stream = bt_heap_maximum(iter->parent.stream_heap);
        if (!file_stream) {
                /* end of file for all streams */
                goto stop;
        }
        stream = &file_stream->parent;
+       if (iter->parent.end_pos &&
+               iter->parent.end_pos->type == BT_SEEK_TIME &&
+               stream->real_timestamp > iter->parent.end_pos->u.seek_time) {
+               goto stop;
+       }
        ret->parent = g_ptr_array_index(stream->events_by_id,
                        stream->event_id);