X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fiterator.c;h=65429a890e68b6b3cb84fabb421f54c1d3a991dc;hp=6b1a6d2ad1668a42d7a6f1e268d71f0b3d8e1193;hb=6fabd7afe089a4e92b80f8a278fd670fb8698970;hpb=5acdc773a649e8fe104cc0e3647b568280c58f05

diff --git a/lib/iterator.c b/lib/iterator.c
index 6b1a6d2a..65429a89 100644
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -223,11 +223,10 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
 			 */
 			stream->timestamp = saved_pos->current_timestamp;
 			stream_pos->offset = saved_pos->offset;
-			stream_pos->last_offset = saved_pos->offset;
+			stream_pos->last_offset = LAST_OFFSET_POISON;
 
 			stream->prev_timestamp = 0;
 			stream->prev_timestamp_end = 0;
-			stream->consumed = 0;
 
 			printf_debug("restored to cur_index = %zd and "
 				"offset = %zd, timestamp = %" PRIu64 "\n",
@@ -337,7 +336,9 @@ struct bt_iter_pos *bt_iter_get_pos(struct bt_iter *iter)
 {
 	struct bt_iter_pos *pos;
 	struct trace_collection *tc = iter->ctx->tc;
-	int i, stream_class_id, stream_id;
+	struct ctf_file_stream *file_stream = NULL, *removed;
+	struct ptr_heap iter_heap_copy;
+	int ret;
 
 	pos = g_new0(struct bt_iter_pos, 1);
 	pos->type = BT_SEEK_RESTORE;
@@ -348,73 +349,46 @@ struct bt_iter_pos *bt_iter_get_pos(struct bt_iter *iter)
 	if (!pos->u.restore->stream_saved_pos)
 		goto error;
 
-	for (i = 0; i < tc->array->len; i++) {
-		struct ctf_trace *tin;
-		struct trace_descriptor *td_read;
+	ret = heap_copy(&iter_heap_copy, iter->stream_heap);
+	if (ret < 0)
+		goto error_heap;
 
-		td_read = g_ptr_array_index(tc->array, i);
-		if (!td_read)
-			continue;
-		tin = container_of(td_read, struct ctf_trace, parent);
+	/* iterate over each stream in the heap */
+	file_stream = heap_maximum(&iter_heap_copy);
+	while (file_stream != NULL) {
+		struct stream_saved_pos saved_pos;
 
-		for (stream_class_id = 0; stream_class_id < tin->streams->len;
-				stream_class_id++) {
-			struct ctf_stream_declaration *stream_class;
+		assert(file_stream->pos.last_offset != LAST_OFFSET_POISON);
+		saved_pos.offset = file_stream->pos.last_offset;
+		saved_pos.file_stream = file_stream;
+		saved_pos.cur_index = file_stream->pos.cur_index;
 
-			stream_class = g_ptr_array_index(tin->streams,
-					stream_class_id);
-			if (!stream_class)
-				continue;
-			for (stream_id = 0;
-					stream_id < stream_class->streams->len;
-					stream_id++) {
-				struct ctf_stream_definition *stream;
-				struct ctf_file_stream *cfs;
-				struct stream_saved_pos saved_pos;
+		saved_pos.current_timestamp = file_stream->parent.timestamp;
 
-				stream = g_ptr_array_index(
-						stream_class->streams,
-						stream_id);
-				if (!stream)
-					continue;
-				cfs = container_of(stream,
-						struct ctf_file_stream,
-						parent);
+		g_array_append_val(
+				pos->u.restore->stream_saved_pos,
+				saved_pos);
 
-				saved_pos.file_stream = cfs;
-				saved_pos.cur_index = cfs->pos.cur_index;
+		printf_debug("stream : %" PRIu64 ", cur_index : %zd, "
+				"offset : %zd, "
+				"timestamp = %" PRIu64 "\n",
+				file_stream->parent.stream_id,
+				saved_pos.cur_index, saved_pos.offset,
+				saved_pos.current_timestamp);
 
-				/*
-				 * It is possible that an event was read during
-				 * the last restore, never consumed and its
-				 * position saved again.  For this case, we
-				 * need to check if the event really was
-				 * consumed by the caller otherwise it is lost.
-				 */
-				if (stream->consumed)
-					saved_pos.offset = cfs->pos.offset;
-				else
-					saved_pos.offset = cfs->pos.last_offset;
-
-				saved_pos.current_timestamp = stream->timestamp;
-
-				g_array_append_val(
-					pos->u.restore->stream_saved_pos,
-					saved_pos);
-
-				printf_debug("stream : %" PRIu64 ", cur_index : %zd, "
-					"offset : %zd, "
-					"timestamp = %" PRIu64 "\n",
-					stream->stream_id, saved_pos.cur_index,
-					saved_pos.offset,
-					saved_pos.current_timestamp);
-			}
-		}
-	}
+		/* remove the stream from the heap copy */
+		removed = heap_remove(&iter_heap_copy);
+		assert(removed == file_stream);
 
+		file_stream = heap_maximum(&iter_heap_copy);
+	}
+	heap_free(&iter_heap_copy);
 	return pos;
 
+error_heap:
+	g_array_free(pos->u.restore->stream_saved_pos, TRUE);
 error:
+	g_free(pos);
 	return NULL;
 }