X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fiterator.c;h=e3ae0689d80ce429da64748f0d7866536900f01b;hp=0af151402b429d3fe95d9c92c42e9e07eb9436f5;hb=889aa6c01b16ee877ca221ed64c79457d01d51c4;hpb=48d5f76c4831624cb4332c7707c2615c2474284c

diff --git a/lib/iterator.c b/lib/iterator.c
index 0af15140..e3ae0689 100644
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -29,6 +29,10 @@
 #include <babeltrace/ctf/events.h>
 #include <inttypes.h>
 
+static int babeltrace_filestream_seek(struct ctf_file_stream *file_stream,
+		const struct bt_iter_pos *begin_pos,
+		unsigned long stream_id);
+
 struct stream_saved_pos {
 	/*
 	 * Use file_stream pointer to check if the trace collection we
@@ -114,11 +118,10 @@ static int seek_file_stream_by_timestamp(struct ctf_file_stream *cfs,
 			continue;
 
 		stream_pos->packet_seek(&stream_pos->parent, i, SEEK_SET);
-		while (cfs->parent.timestamp < timestamp) {
+		do {
 			ret = stream_read_event(cfs);
-			if (ret < 0)
-				break;
-		}
+		} while (cfs->parent.timestamp < timestamp && ret >= 0);
+
 		return 0;
 	}
 	return EOF;
@@ -140,12 +143,12 @@ static int seek_ctf_trace_by_timestamp(struct ctf_trace *tin,
 
 	/* for each stream_class */
 	for (i = 0; i < tin->streams->len; i++) {
-		struct ctf_stream_class *stream_class;
+		struct ctf_stream_declaration *stream_class;
 
 		stream_class = g_ptr_array_index(tin->streams, i);
 		/* for each file_stream */
 		for (j = 0; j < stream_class->streams->len; j++) {
-			struct ctf_stream *stream;
+			struct ctf_stream_definition *stream;
 			struct ctf_file_stream *cfs;
 
 			stream = g_ptr_array_index(stream_class->streams, j);
@@ -187,7 +190,7 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
 				i++) {
 			struct stream_saved_pos *saved_pos;
 			struct ctf_stream_pos *stream_pos;
-			struct ctf_stream *stream;
+			struct ctf_stream_definition *stream;
 
 			saved_pos = &g_array_index(
 					iter_pos->u.restore->stream_saved_pos,
@@ -247,6 +250,39 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
 				goto error;
 		}
 		return 0;
+	case BT_SEEK_BEGIN:
+		tc = iter->ctx->tc;
+		for (i = 0; i < tc->array->len; i++) {
+			struct ctf_trace *tin;
+			struct trace_descriptor *td_read;
+			int stream_id;
+
+			td_read = g_ptr_array_index(tc->array, i);
+			tin = container_of(td_read, struct ctf_trace, parent);
+
+			/* Populate heap with each stream */
+			for (stream_id = 0; stream_id < tin->streams->len;
+					stream_id++) {
+				struct ctf_stream_declaration *stream;
+				int filenr;
+
+				stream = g_ptr_array_index(tin->streams,
+						stream_id);
+				if (!stream)
+					continue;
+				for (filenr = 0; filenr < stream->streams->len;
+						filenr++) {
+					struct ctf_file_stream *file_stream;
+					file_stream = g_ptr_array_index(
+							stream->streams,
+							filenr);
+					ret = babeltrace_filestream_seek(
+							file_stream, iter_pos,
+							stream_id);
+				}
+			}
+		}
+		break;
 	default:
 		/* not implemented */
 		return -EINVAL;
@@ -288,14 +324,14 @@ struct bt_iter_pos *bt_iter_get_pos(struct bt_iter *iter)
 
 		for (stream_class_id = 0; stream_class_id < tin->streams->len;
 				stream_class_id++) {
-			struct ctf_stream_class *stream_class;
+			struct ctf_stream_declaration *stream_class;
 
 			stream_class = g_ptr_array_index(tin->streams,
 					stream_class_id);
 			for (stream_id = 0;
 					stream_id < stream_class->streams->len;
 					stream_id++) {
-				struct ctf_stream *stream;
+				struct ctf_stream_definition *stream;
 				struct ctf_file_stream *cfs;
 				struct stream_saved_pos saved_pos;
 
@@ -407,7 +443,7 @@ int bt_iter_seek(struct bt_iter *iter,
 		/* Populate heap with each stream */
 		for (stream_id = 0; stream_id < tin->streams->len;
 				stream_id++) {
-			struct ctf_stream_class *stream;
+			struct ctf_stream_declaration *stream;
 			int filenr;
 
 			stream = g_ptr_array_index(tin->streams, stream_id);
@@ -430,12 +466,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);
@@ -455,7 +496,7 @@ int bt_iter_init(struct bt_iter *iter,
 		/* Populate heap with each stream */
 		for (stream_id = 0; stream_id < tin->streams->len;
 				stream_id++) {
-			struct ctf_stream_class *stream;
+			struct ctf_stream_declaration *stream;
 			int filenr;
 
 			stream = g_ptr_array_index(tin->streams, stream_id);
@@ -469,14 +510,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);
+				} 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;
-				    }
+				}
+				if (ret == EOF) {
+					ret = 0;
+					continue;
+				} else if (ret) {
+					goto error;
 				}
 				/* Add to heap */
 				ret = heap_insert(iter->stream_heap, file_stream);
@@ -486,18 +535,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;
@@ -517,6 +568,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);
 }