X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fiterator-internal.h;h=2b0b2f23c2b5460b55ce86e9b5ad78a7c15af0a2;hp=c9b5d60716f43d7eee77b580a58147f35f994b8d;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=e419579102094d83539d79ce6af83d9786d387ee

diff --git a/include/babeltrace/iterator-internal.h b/include/babeltrace/iterator-internal.h
index c9b5d607..2b0b2f23 100644
--- a/include/babeltrace/iterator-internal.h
+++ b/include/babeltrace/iterator-internal.h
@@ -19,9 +19,16 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
-#include <babeltrace/callbacks-internal.h>
 #include <babeltrace/ctf/events.h>
 
 /*
@@ -31,30 +38,34 @@
 struct bt_iter {
 	struct ptr_heap *stream_heap;
 	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 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;
-	/*
-	 * 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
-	 * bt_iter.
-	 */
-	GPtrArray *dep_gc;
+	const struct bt_iter_pos *end_pos;
 };
 
+/*
+ * bt_iter_create - Allocate a trace collection iterator.
+ *
+ * begin_pos and end_pos are optional parameters to specify the position
+ * at which the trace collection should be seeked upon iterator
+ * creation, and the position at which iteration will start returning
+ * "EOF".
+ *
+ * By default, if begin_pos is NULL, a BT_SEEK_CUR is performed at
+ * creation. By default, if end_pos is NULL, a BT_SEEK_END (end of
+ * trace) is the EOF criterion.
+ */
+struct bt_iter *bt_iter_create(struct bt_context *ctx,
+		const struct bt_iter_pos *begin_pos,
+		const struct bt_iter_pos *end_pos);
+
+/*
+ * bt_iter_destroy - Free a trace collection iterator.
+ */
+void bt_iter_destroy(struct bt_iter *iter);
+
 int bt_iter_init(struct bt_iter *iter,
 		struct bt_context *ctx,
-		struct bt_iter_pos *begin_pos,
-		struct bt_iter_pos *end_pos);
+		const struct bt_iter_pos *begin_pos,
+		const struct bt_iter_pos *end_pos);
 void bt_iter_fini(struct bt_iter *iter);
 
 #endif /* _BABELTRACE_ITERATOR_INTERNAL_H */