X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fiterator.c;h=f820fdb6ce87fc30196157e4dcd21fc83bdbfaba;hp=3dbe878846ab3699af938d2e3a98c202eca8d7b3;hb=b42d4e4eb51a906d1391a6d595fe7bff8b427c7d;hpb=634d474be8d4262f5a3e549cdb6891de239f4fe4

diff --git a/lib/iterator.c b/lib/iterator.c
index 3dbe8788..f820fdb6 100644
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -110,8 +110,7 @@ static int seek_file_stream_by_timestamp(struct ctf_file_stream *cfs,
 	for (i = 0; i < stream_pos->packet_index->len; i++) {
 		index = &g_array_index(stream_pos->packet_index,
 				struct packet_index, i);
-		if (index->timestamp_begin >= timestamp ||
-				index->timestamp_end <= timestamp)
+		if (index->timestamp_end <= timestamp)
 			continue;
 
 		stream_pos->packet_seek(&stream_pos->parent, i, SEEK_SET);
@@ -177,7 +176,7 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
 	switch (iter_pos->type) {
 	case BT_SEEK_RESTORE:
 		if (!iter_pos->u.restore)
-			goto error_arg;
+			return -EINVAL;
 
 		heap_free(iter->stream_heap);
 		ret = heap_init(iter->stream_heap, 0, stream_compare);
@@ -228,9 +227,6 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
 	case BT_SEEK_TIME:
 		tc = iter->ctx->tc;
 
-		if (!iter_pos->u.seek_time)
-			goto error_arg;
-
 		heap_free(iter->stream_heap);
 		ret = heap_init(iter->stream_heap, 0, stream_compare);
 		if (ret < 0)
@@ -253,13 +249,11 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
 		return 0;
 	default:
 		/* not implemented */
-		goto error_arg;
+		return -EINVAL;
 	}
 
 	return 0;
 
-error_arg:
-	ret = -EINVAL;
 error:
 	heap_free(iter->stream_heap);
 	if (heap_init(iter->stream_heap, 0, stream_compare) < 0) {
@@ -436,12 +430,17 @@ end:
 
 int bt_iter_init(struct bt_iter *iter,
 		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)
 {
 	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);
@@ -475,14 +474,22 @@ int bt_iter_init(struct bt_iter *iter,
 						filenr);
 
 				if (begin_pos) {
-				    ret = babeltrace_filestream_seek(file_stream, begin_pos,
+					ret = babeltrace_filestream_seek(
+							file_stream,
+							begin_pos,
 							stream_id);
-				    if (ret == EOF) {
-					   ret = 0;
-					   continue;
-				    } else if (ret) {
-					   goto error;
-				    }
+				} 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;
 				}
 				/* Add to heap */
 				ret = heap_insert(iter->stream_heap, file_stream);
@@ -492,18 +499,20 @@ int bt_iter_init(struct bt_iter *iter,
 		}
 	}
 
+	ctx->current_iterator = iter;
 	return 0;
 
 error:
 	heap_free(iter->stream_heap);
 error_heap_init:
 	g_free(iter->stream_heap);
+error_ctx:
 	return ret;
 }
 
 struct bt_iter *bt_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_iter *iter;
 	int ret;
@@ -523,6 +532,7 @@ void bt_iter_fini(struct bt_iter *iter)
 		heap_free(iter->stream_heap);
 		g_free(iter->stream_heap);
 	}
+	iter->ctx->current_iterator = NULL;
 	bt_context_put(iter->ctx);
 }