X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fiterator.c;h=bcb77d8843b2eca392ebb0517bafd934e3f5bcea;hp=398b097bce00bdb7723bcb2ea75c22d399888620;hb=5f0b5523775fe5fe8dcc7c232aa831979a36498c;hpb=20d0dcf9609dcd28aebe87c167d6600ddbe668d1

diff --git a/lib/iterator.c b/lib/iterator.c
index 398b097b..bcb77d88 100644
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -20,16 +20,19 @@
 
 #include <stdlib.h>
 #include <babeltrace/babeltrace.h>
-#include <babeltrace/callbacks-internal.h>
 #include <babeltrace/context.h>
 #include <babeltrace/context-internal.h>
-#include <babeltrace/ctf/metadata.h>
 #include <babeltrace/iterator-internal.h>
 #include <babeltrace/iterator.h>
 #include <babeltrace/prio_heap.h>
+#include <babeltrace/ctf/metadata.h>
 #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
@@ -38,7 +41,8 @@ struct stream_saved_pos {
 	struct ctf_file_stream *file_stream;
 	size_t cur_index;	/* current index in packet index */
 	ssize_t offset;		/* offset from base, in bits. EOF for end of file. */
-	uint64_t current_timestamp;
+	uint64_t current_real_timestamp;
+	uint64_t current_cycles_timestamp;
 };
 
 struct bt_saved_pos {
@@ -67,7 +71,7 @@ int stream_compare(void *a, void *b)
 {
 	struct ctf_file_stream *s_a = a, *s_b = b;
 
-	if (s_a->parent.timestamp < s_b->parent.timestamp)
+	if (s_a->parent.real_timestamp < s_b->parent.real_timestamp)
 		return 1;
 	else
 		return 0;
@@ -78,7 +82,7 @@ void bt_iter_free_pos(struct bt_iter_pos *iter_pos)
 	if (!iter_pos)
 		return;
 
-	if (iter_pos->u.restore) {
+	if (iter_pos->type == BT_SEEK_RESTORE && iter_pos->u.restore) {
 		if (iter_pos->u.restore->stream_saved_pos) {
 			g_array_free(
 				iter_pos->u.restore->stream_saved_pos,
@@ -97,8 +101,8 @@ void bt_iter_free_pos(struct bt_iter_pos *iter_pos)
  * are looking for (either the exact timestamp or the event just after the
  * timestamp).
  *
- * Return 0 if the seek succeded and EOF if we didn't find any packet
- * containing the timestamp.
+ * Return 0 if the seek succeded, EOF if we didn't find any packet
+ * containing the timestamp, or a positive integer for error.
  */
 static int seek_file_stream_by_timestamp(struct ctf_file_stream *cfs,
 		uint64_t timestamp)
@@ -108,21 +112,24 @@ static int seek_file_stream_by_timestamp(struct ctf_file_stream *cfs,
 	int i, ret;
 
 	stream_pos = &cfs->pos;
-	for (i = 0; i < stream_pos->packet_index->len; i++) {
-		index = &g_array_index(stream_pos->packet_index,
+	for (i = 0; i < stream_pos->packet_real_index->len; i++) {
+		index = &g_array_index(stream_pos->packet_real_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);
-		while (cfs->parent.timestamp < timestamp) {
+		do {
 			ret = stream_read_event(cfs);
-			if (ret < 0)
-				break;
-		}
-		return 0;
+		} while (cfs->parent.real_timestamp < timestamp && ret == 0);
+
+		/* Can return either EOF, 0, or error (> 0). */
+		return ret;
 	}
+	/*
+	 * Cannot find the timestamp within the stream packets, return
+	 * EOF.
+	 */
 	return EOF;
 }
 
@@ -132,42 +139,52 @@ static int seek_file_stream_by_timestamp(struct ctf_file_stream *cfs,
  *
  * Return 0 on success.
  * If the timestamp is not part of any file stream, return EOF to inform the
- * user the timestamp is out of the scope
+ * user the timestamp is out of the scope.
+ * On other errors, return positive value.
  */
 static int seek_ctf_trace_by_timestamp(struct ctf_trace *tin,
 		uint64_t timestamp, struct ptr_heap *stream_heap)
 {
 	int i, j, ret;
-	int found = EOF;
+	int found = 0;
 
 	/* 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);
+		if (!stream_class)
+			continue;
 		/* 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);
+			if (!stream)
+				continue;
 			cfs = container_of(stream, struct ctf_file_stream,
 					parent);
 			ret = seek_file_stream_by_timestamp(cfs, timestamp);
 			if (ret == 0) {
 				/* Add to heap */
 				ret = heap_insert(stream_heap, cfs);
-				if (ret)
-					goto error;
-				found = 0;
+				if (ret) {
+					/* Return positive error. */
+					return -ret;
+				}
+				found = 1;
+			} else if (ret > 0) {
+				/*
+				 * Error in seek (not EOF), failure.
+				 */
+				return ret;
 			}
+			/* on EOF just do not put stream into heap. */
 		}
 	}
 
-	return found;
-
-error:
-	return -2;
+	return found ? 0 : EOF;
 }
 
 int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
@@ -178,18 +195,18 @@ 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);
 		if (ret < 0)
-			goto error;
+			goto error_heap_init;
 
 		for (i = 0; i < iter_pos->u.restore->stream_saved_pos->len;
 				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,
@@ -205,18 +222,20 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
 			 * packet_seek, because this function resets
 			 * the timestamp to the beginning of the packet
 			 */
-			stream->timestamp = saved_pos->current_timestamp;
+			stream->real_timestamp = saved_pos->current_real_timestamp;
+			stream->cycles_timestamp = saved_pos->current_cycles_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;
+			stream->prev_real_timestamp = 0;
+			stream->prev_real_timestamp_end = 0;
+			stream->prev_cycles_timestamp = 0;
+			stream->prev_cycles_timestamp_end = 0;
 
 			printf_debug("restored to cur_index = %zd and "
 				"offset = %zd, timestamp = %" PRIu64 "\n",
 				stream_pos->cur_index,
-				stream_pos->offset, stream->timestamp);
+				stream_pos->offset, stream->real_timestamp);
 
 			stream_read_event(saved_pos->file_stream);
 
@@ -226,16 +245,14 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
 			if (ret)
 				goto error;
 		}
+		return 0;
 	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)
-			goto error;
+			goto error_heap_init;
 
 		/* for each trace in the trace_collection */
 		for (i = 0; i < tc->array->len; i++) {
@@ -243,32 +260,89 @@ int bt_iter_set_pos(struct bt_iter *iter, const struct bt_iter_pos *iter_pos)
 			struct trace_descriptor *td_read;
 
 			td_read = g_ptr_array_index(tc->array, i);
+			if (!td_read)
+				continue;
 			tin = container_of(td_read, struct ctf_trace, parent);
 
 			ret = seek_ctf_trace_by_timestamp(tin,
 					iter_pos->u.seek_time,
 					iter->stream_heap);
-			if (ret < 0)
+			/*
+			 * Positive errors are failure. Negative value
+			 * is EOF (for which we continue with other
+			 * traces). 0 is success. Note: on EOF, it just
+			 * means that no stream has been added to the
+			 * iterator for that trace, which is fine.
+			 */
+			if (ret != 0 && ret != EOF)
 				goto error;
 		}
 		return 0;
+	case BT_SEEK_BEGIN:
+		tc = iter->ctx->tc;
+		heap_free(iter->stream_heap);
+		ret = heap_init(iter->stream_heap, 0, stream_compare);
+		if (ret < 0)
+			goto error_heap_init;
+
+		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);
+			if (!td_read)
+				continue;
+			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);
+					if (!file_stream)
+						continue;
+					ret = babeltrace_filestream_seek(
+							file_stream, iter_pos,
+							stream_id);
+					if (ret != 0 && ret != EOF) {
+						goto error;
+					}
+					ret = heap_insert(iter->stream_heap, file_stream);
+					if (ret)
+						goto error;
+				}
+			}
+		}
+		break;
 	default:
 		/* not implemented */
-		goto error_arg;
+		return -EINVAL;
 	}
 
 	return 0;
 
-error_arg:
-	ret = -EINVAL;
 error:
 	heap_free(iter->stream_heap);
+error_heap_init:
 	if (heap_init(iter->stream_heap, 0, stream_compare) < 0) {
 		heap_free(iter->stream_heap);
 		g_free(iter->stream_heap);
 		iter->stream_heap = NULL;
 		ret = -ENOMEM;
 	}
+
 	return ret;
 }
 
@@ -276,9 +350,12 @@ 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;
 	pos->u.restore = g_new0(struct bt_saved_pos, 1);
 	pos->u.restore->tc = tc;
 	pos->u.restore->stream_saved_pos = g_array_new(FALSE, TRUE,
@@ -286,67 +363,47 @@ 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;
-
-		td_read = g_ptr_array_index(tc->array, i);
-		tin = container_of(td_read, struct ctf_trace, parent);
-
-		for (stream_class_id = 0; stream_class_id < tin->streams->len;
-				stream_class_id++) {
-			struct ctf_stream_class *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_file_stream *cfs;
-				struct stream_saved_pos saved_pos;
-
-				stream = g_ptr_array_index(
-						stream_class->streams,
-						stream_id);
-				cfs = container_of(stream,
-						struct ctf_file_stream,
-						parent);
-
-				saved_pos.file_stream = cfs;
-				saved_pos.cur_index = cfs->pos.cur_index;
+	ret = heap_copy(&iter_heap_copy, iter->stream_heap);
+	if (ret < 0)
+		goto error_heap;
+
+	/* iterate over each stream in the heap */
+	file_stream = heap_maximum(&iter_heap_copy);
+	while (file_stream != NULL) {
+		struct stream_saved_pos saved_pos;
+
+		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;
+
+		saved_pos.current_real_timestamp = file_stream->parent.real_timestamp;
+		saved_pos.current_cycles_timestamp = file_stream->parent.cycles_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",
+				file_stream->parent.stream_id,
+				saved_pos.cur_index, saved_pos.offset,
+				saved_pos.current_real_timestamp);
+
+		/* remove the stream from the heap copy */
+		removed = heap_remove(&iter_heap_copy);
+		assert(removed == file_stream);
 
-				/*
-				 * 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);
-			}
-		}
+		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;
 }
 
@@ -394,62 +451,21 @@ static int babeltrace_filestream_seek(struct ctf_file_stream *file_stream,
 	return ret;
 }
 
-/*
- * bt_iter_seek: seek iterator to given position.
- */
-int bt_iter_seek(struct bt_iter *iter,
-		const struct bt_iter_pos *begin_pos)
+int bt_iter_init(struct bt_iter *iter,
+		struct bt_context *ctx,
+		const struct bt_iter_pos *begin_pos,
+		const struct bt_iter_pos *end_pos)
 {
 	int i, stream_id;
 	int ret = 0;
-	struct trace_collection *tc = iter->ctx->tc;
-
-	for (i = 0; i < tc->array->len; i++) {
-		struct ctf_trace *tin;
-		struct trace_descriptor *td_read;
 
-		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_class *stream;
-			int filenr;
-
-			stream = g_ptr_array_index(tin->streams, stream_id);
-			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, begin_pos,
-						stream_id);
-				if (ret < 0)
-					goto end;
-			}
-		}
+	if (ctx->current_iterator) {
+		ret = -1;
+		goto error_ctx;
 	}
-end:
-	return ret;
-}
 
-struct bt_iter *bt_iter_create(struct bt_context *ctx,
-		struct bt_iter_pos *begin_pos,
-		struct bt_iter_pos *end_pos)
-{
-	int i, stream_id;
-	int ret = 0;
-	struct bt_iter *iter;
-
-	iter = g_new0(struct bt_iter, 1);
 	iter->stream_heap = g_new(struct ptr_heap, 1);
 	iter->end_pos = end_pos;
-	iter->callbacks = g_array_new(0, 1, sizeof(struct bt_stream_callbacks));
-	iter->recalculate_dep_graph = 0;
-	iter->main_callbacks.callback = NULL;
-	iter->dep_gc = g_ptr_array_new();
 	bt_context_get(ctx);
 	iter->ctx = ctx;
 
@@ -462,12 +478,14 @@ struct bt_iter *bt_iter_create(struct bt_context *ctx,
 		struct trace_descriptor *td_read;
 
 		td_read = g_ptr_array_index(ctx->tc->array, i);
+		if (!td_read)
+			continue;
 		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_class *stream;
+			struct ctf_stream_declaration *stream;
 			int filenr;
 
 			stream = g_ptr_array_index(tin->streams, stream_id);
@@ -479,16 +497,25 @@ struct bt_iter *bt_iter_create(struct bt_context *ctx,
 
 				file_stream = g_ptr_array_index(stream->streams,
 						filenr);
-
+				if (!file_stream)
+					continue;
 				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);
@@ -498,49 +525,47 @@ struct bt_iter *bt_iter_create(struct bt_context *ctx,
 		}
 	}
 
-	return iter;
+	ctx->current_iterator = iter;
+	return 0;
 
 error:
 	heap_free(iter->stream_heap);
 error_heap_init:
 	g_free(iter->stream_heap);
-	g_free(iter);
-	return NULL;
+	iter->stream_heap = NULL;
+error_ctx:
+	return ret;
 }
 
-void bt_iter_destroy(struct bt_iter *iter)
+struct bt_iter *bt_iter_create(struct bt_context *ctx,
+		const struct bt_iter_pos *begin_pos,
+		const struct bt_iter_pos *end_pos)
 {
-	struct bt_stream_callbacks *bt_stream_cb;
-	struct bt_callback_chain *bt_chain;
-	int i, j;
+	struct bt_iter *iter;
+	int ret;
+
+	iter = g_new0(struct bt_iter, 1);
+	ret = bt_iter_init(iter, ctx, begin_pos, end_pos);
+	if (ret) {
+		g_free(iter);
+		return NULL;
+	}
+	return iter;
+}
 
+void bt_iter_fini(struct bt_iter *iter)
+{
 	if (iter->stream_heap) {
 		heap_free(iter->stream_heap);
 		g_free(iter->stream_heap);
 	}
-
-	/* free all events callbacks */
-	if (iter->main_callbacks.callback)
-		g_array_free(iter->main_callbacks.callback, TRUE);
-
-	/* free per-event callbacks */
-	for (i = 0; i < iter->callbacks->len; i++) {
-		bt_stream_cb = &g_array_index(iter->callbacks,
-				struct bt_stream_callbacks, i);
-		if (!bt_stream_cb || !bt_stream_cb->per_id_callbacks)
-			continue;
-		for (j = 0; j < bt_stream_cb->per_id_callbacks->len; j++) {
-			bt_chain = &g_array_index(bt_stream_cb->per_id_callbacks,
-					struct bt_callback_chain, j);
-			if (bt_chain->callback) {
-				g_array_free(bt_chain->callback, TRUE);
-			}
-		}
-		g_array_free(bt_stream_cb->per_id_callbacks, TRUE);
-	}
-
+	iter->ctx->current_iterator = NULL;
 	bt_context_put(iter->ctx);
+}
 
+void bt_iter_destroy(struct bt_iter *iter)
+{
+	bt_iter_fini(iter);
 	g_free(iter);
 }
 
@@ -572,28 +597,3 @@ int bt_iter_next(struct bt_iter *iter)
 end:
 	return ret;
 }
-
-struct bt_ctf_event *bt_iter_read_ctf_event(struct bt_iter *iter)
-{
-	struct ctf_file_stream *file_stream;
-	struct bt_ctf_event *ret = &iter->current_ctf_event;
-
-	file_stream = heap_maximum(iter->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);
-
-	if (ret->stream->stream_id > iter->callbacks->len)
-		goto end;
-
-	process_callbacks(iter, ret->stream);
-
-end:
-	return ret;
-stop:
-	return NULL;
-}