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

diff --git a/lib/iterator.c b/lib/iterator.c
index 398b097b..3dbe8788 100644
--- a/lib/iterator.c
+++ b/lib/iterator.c
@@ -20,13 +20,12 @@
 
 #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>
 
@@ -435,21 +434,16 @@ end:
 	return ret;
 }
 
-struct bt_iter *bt_iter_create(struct bt_context *ctx,
+int bt_iter_init(struct bt_iter *iter,
+		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;
 
@@ -498,49 +492,43 @@ struct bt_iter *bt_iter_create(struct bt_context *ctx,
 		}
 	}
 
-	return iter;
+	return 0;
 
 error:
 	heap_free(iter->stream_heap);
 error_heap_init:
 	g_free(iter->stream_heap);
-	g_free(iter);
-	return NULL;
+	return ret;
 }
 
-void bt_iter_destroy(struct bt_iter *iter)
+struct bt_iter *bt_iter_create(struct bt_context *ctx,
+		struct bt_iter_pos *begin_pos,
+		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);
-	}
-
 	bt_context_put(iter->ctx);
+}
 
+void bt_iter_destroy(struct bt_iter *iter)
+{
+	bt_iter_fini(iter);
 	g_free(iter);
 }
 
@@ -572,28 +560,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;
-}