X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fiterator-internal.h;h=121d0dccb3d6c4bf3a74918a64e176632225d2ad;hp=511e9a92e291caa955af5ddd8c1f6323802dad58;hb=9843982dca5a80c001fc5989a9ce5a2283b0740f;hpb=6f3077a2db5bfeb47ed75b1c7c731a5e8e60aa43

diff --git a/include/babeltrace/iterator-internal.h b/include/babeltrace/iterator-internal.h
index 511e9a92..121d0dcc 100644
--- a/include/babeltrace/iterator-internal.h
+++ b/include/babeltrace/iterator-internal.h
@@ -21,21 +21,24 @@
  * all copies or substantial portions of the Software.
  */
 
+#include <babeltrace/ctf/events.h>
+
 /*
- * struct babeltrace_iter: data structure representing an iterator on a trace
+ * struct bt_iter: data structure representing an iterator on a trace
  * collection.
  */
-struct babeltrace_iter {
+struct bt_iter {
 	struct ptr_heap *stream_heap;
-	struct trace_collection *tc;
-	struct trace_collection_pos *end_pos;
+	struct bt_context *ctx;
+	struct bt_iter_pos *end_pos;
+	struct bt_ctf_event current_ctf_event;		/* last read event */
 	GArray *callbacks;				/* Array of struct bt_stream_callbacks */
 	struct bt_callback_chain main_callbacks;	/* For all events */
 	/*
 	 * Flag indicating if dependency graph needs to be recalculated.
-	 * Set by babeltrace_iter_add_callback(), and checked (and
-	 * cleared) by upon entry into babeltrace_iter_read_event().
-	 * babeltrace_iter_read_event() is responsible for calling dep
+	 * Set by bt_iter_add_callback(), and checked (and
+	 * cleared) by upon entry into bt_iter_read_event().
+	 * bt_iter_read_event() is responsible for calling dep
 	 * graph calculation if it sees this flag set.
 	 */
 	int recalculate_dep_graph;
@@ -43,7 +46,7 @@ struct babeltrace_iter {
 	 * Array of pointers to struct bt_dependencies, for garbage
 	 * collection. We're not using a linked list here because each
 	 * struct bt_dependencies can belong to more than one
-	 * babeltrace_iter.
+	 * bt_iter.
 	 */
 	GPtrArray *dep_gc;
 };