X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fiterator.c;h=e5d32a890b503220a9ecefde2c31ae8464b12030;hb=a53ed9239af287c20f0668413b3c8239a487c920;hp=0534d013acc601220dd41986aea26805a7169d88;hpb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;p=babeltrace.git

diff --git a/formats/ctf/iterator.c b/formats/ctf/iterator.c
index 0534d013..e5d32a89 100644
--- a/formats/ctf/iterator.c
+++ b/formats/ctf/iterator.c
@@ -119,22 +119,43 @@ 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)
+	if (!file_stream->pos.packet_index)
 		packet_index = NULL;
 	else
-		packet_index = &g_array_index(file_stream->pos.packet_cycles_index,
+		packet_index = &g_array_index(file_stream->pos.packet_index,
 				struct packet_index, file_stream->pos.cur_index);
 	iter->events_lost = 0;
 	if (packet_index && packet_index->events_discarded >