fix: move read event from iterator to event.h

[babeltrace.git] / include / babeltrace / iterator-internal.h

diff --git a/include/babeltrace/iterator-internal.h b/include/babeltrace/iterator-internal.h
index 511e9a92e291caa955af5ddd8c1f6323802dad58..c9b5d60716f43d7eee77b580a58147f35f994b8d 100644 (file)
--- 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/callbacks-internal.h>
+#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;
        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,9 +46,15 @@ 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;
 };
 
+int bt_iter_init(struct bt_iter *iter,
+               struct bt_context *ctx,
+               struct bt_iter_pos *begin_pos,
+               struct bt_iter_pos *end_pos);
+void bt_iter_fini(struct bt_iter *iter);
+
 #endif /* _BABELTRACE_ITERATOR_INTERNAL_H */