X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fiterator.c;h=0ac041910f7aedf9d967600efd24e718318b6891;hp=3413dbb02e07a2885e76aa2dc3f497bf1906953a;hb=f60efc0e475b3c2fca3b2afc584615f6c482c9e7;hpb=a7765dd4491b15629e3884493db0f29611b84e65

diff --git a/formats/ctf/iterator.c b/formats/ctf/iterator.c
index 3413dbb0..0ac04191 100644
--- a/formats/ctf/iterator.c
+++ b/formats/ctf/iterator.c
@@ -32,12 +32,15 @@
 #include "events-private.h"
 
 struct bt_ctf_iter *bt_ctf_iter_create(struct bt_context *ctx,
-		struct bt_iter_pos *begin_pos,
-		struct bt_iter_pos *end_pos)
+		const struct bt_iter_pos *begin_pos,
+		const struct bt_iter_pos *end_pos)
 {
 	struct bt_ctf_iter *iter;
 	int ret;
 
+	if (!ctx)
+		return NULL;
+
 	iter = g_new0(struct bt_ctf_iter, 1);
 	ret = bt_iter_init(&iter->parent, ctx, begin_pos, end_pos);
 	if (ret) {
@@ -57,6 +60,8 @@ void bt_ctf_iter_destroy(struct bt_ctf_iter *iter)
 	struct bt_callback_chain *bt_chain;
 	int i, j;
 
+	assert(iter);
+
 	/* free all events callbacks */
 	if (iter->main_callbacks.callback)
 		g_array_free(iter->main_callbacks.callback, TRUE);
@@ -83,30 +88,74 @@ void bt_ctf_iter_destroy(struct bt_ctf_iter *iter)
 
 struct bt_iter *bt_ctf_get_iter(struct bt_ctf_iter *iter)
 {
+	if (!iter)
+		return NULL;
+
 	return &iter->parent;
 }
 
-struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter)
+struct bt_ctf_event *bt_ctf_iter_read_event_flags(struct bt_ctf_iter *iter,
+		int *flags)
 {
 	struct ctf_file_stream *file_stream;
-	struct bt_ctf_event *ret = &iter->current_ctf_event;
+	struct bt_ctf_event *ret;
+	struct ctf_stream_definition *stream;
+	struct packet_index *packet_index;
+
+	/*
+	 * We do not want to fail for any other reason than end of
+	 * trace, hence the assert.
+	 */
+	assert(iter);
 
+	ret = &iter->current_ctf_event;
 	file_stream = heap_maximum(iter->parent.stream_heap);
 	if (!file_stream) {
 		/* end of file for all streams */
 		goto stop;
 	}
-	ret->stream = &file_stream->parent;
-	ret->event = g_ptr_array_index(ret->stream->events_by_id,
-			ret->stream->event_id);
+	stream = &file_stream->parent;
+	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
+		packet_index = &g_array_index(file_stream->pos.packet_cycles_index,
+				struct packet_index, file_stream->pos.cur_index);
+	iter->events_lost = 0;
+	if (packet_index && packet_index->events_discarded >
+			file_stream->pos.last_events_discarded) {
+		if (flags)
+			*flags |= BT_ITER_FLAG_LOST_EVENTS;
+		iter->events_lost += packet_index->events_discarded -
+			file_stream->pos.last_events_discarded;
+		file_stream->pos.last_events_discarded =
+			packet_index->events_discarded;
+	}
 
-	if (ret->stream->stream_id > iter->callbacks->len)
+	if (ret->parent->stream->stream_id > iter->callbacks->len)
 		goto end;
 
-	process_callbacks(iter, ret->stream);
+	process_callbacks(iter, ret->parent->stream);
 
 end:
 	return ret;
 stop:
 	return NULL;
 }
+
+struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter)
+{
+	return bt_ctf_iter_read_event_flags(iter, NULL);
+}
+
+uint64_t bt_ctf_get_lost_events_count(struct bt_ctf_iter *iter)
+{
+	if (!iter)
+		return -1ULL;
+
+	return iter->events_lost;
+}