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

diff --git a/lib/iterator.c b/lib/iterator.c
index 398b097b..784166f2 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
@@ -111,8 +114,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);
@@ -142,12 +144,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);
@@ -178,7 +180,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);
@@ -189,7 +191,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,
@@ -229,9 +231,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)
@@ -252,15 +251,46 @@ 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 */
-		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) {
@@ -295,14 +325,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;
 
@@ -414,7 +444,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);
@@ -435,21 +465,21 @@ 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 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 bt_iter *iter;
 
-	iter = g_new0(struct bt_iter, 1);
+	if (ctx->current_iterator) {
+		ret = -1;
+		goto error_ctx;
+	}
+
 	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;
 
@@ -467,7 +497,7 @@ struct bt_iter *bt_iter_create(struct bt_context *ctx,
 		/* 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);
@@ -481,14 +511,22 @@ struct bt_iter *bt_iter_create(struct bt_context *ctx,
 						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);
@@ -498,49 +536,46 @@ 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;
+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 +607,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;
-}