Fix: import index containing only a header

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

diff --git a/formats/ctf/iterator.c b/formats/ctf/iterator.c
index 0534d013acc601220dd41986aea26805a7169d88..69bb0f4b7c513ff7b0bd9c8b07ad7cd9669c62f0 100644 (file)
--- a/formats/ctf/iterator.c
+++ b/formats/ctf/iterator.c
@@ -119,18 +119,39 @@ struct bt_ctf_event *bt_ctf_iter_read_event_flags(struct bt_ctf_iter *iter,
         */
        assert(iter);
 
+       if (flags)
+               *flags = 0;
+
        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;
        }
+
+       /*
+        * If the packet is empty (contains only headers or is of size 0), the
+        * caller has to know that we can't read the current event and we need
+        * to do a bt_iter_next.
+        */
+       if (file_stream->pos.data_offset == file_stream->pos.content_size
+                       || file_stream->pos.content_size == 0) {
+               /* More events may come. */
+               ret = NULL;
+               if (flags)
+                       *flags |= BT_ITER_FLAG_RETRY;
+               goto end;
+       }
+
        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);
 
-       if (flags)
-               *flags = 0;
        if (!file_stream->pos.packet_cycles_index)
                packet_index = NULL;
        else