X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace.h;h=623967eb4f793649a8221769b58990f3845c2dc3;hp=6c3fe967e635ee05973a08c3d35dcdc027e9b64f;hb=eef72c75647792175297e699f8dc3096f35d0abe;hpb=063f70486d49320f996630ae2522bc9a2341f882

diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index 6c3fe967..623967eb 100644
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -17,89 +17,10 @@
  * all copies or substantial portions of the Software.
  */
 
-/* Forward declarations */
-struct babeltrace_iter;
-struct trace_collection;
-struct ctf_stream_event;
-struct ctf_stream;
-struct babeltrace_saved_pos;
-
-struct trace_collection_pos {
-	enum {
-		BT_SEEK_TIME,		/* uses u.seek_time */
-		BT_SEEK_RESTORE,	/* uses u.restore */
-		BT_SEEK_CUR,
-		BT_SEEK_BEGIN,
-		BT_SEEK_END,
-	} type;
-	union {
-		uint64_t seek_time;
-		struct babeltrace_saved_pos *restore;
-	} u;
-};
-
-/*
- * babeltrace_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 babeltrace_iter *babeltrace_iter_create(struct trace_collection *tc,
-		struct trace_collection_pos *begin_pos,
-		struct trace_collection_pos *end_pos);
-
-/*
- * babeltrace_iter_destroy - Free a trace collection iterator.
- */
-void babeltrace_iter_destroy(struct babeltrace_iter *iter);
-
-/*
- * babeltrace_iter_next: Move trace collection position to the next event.
- *
- * Returns 0 on success, a negative value on error
- */
-int babeltrace_iter_next(struct babeltrace_iter *iter);
-
-/*
- * babeltrace_iter_save_pos - Save the current trace collection position.
- *
- * The position returned by this function needs to be freed by
- * babeltrace_iter_free_pos after use.
- */
-struct trace_collection_pos *
-	babeltrace_iter_save_pos(struct babeltrace_iter *iter);
-
-/*
- * babeltrace_iter_free_pos - Free the position.
- */
-void babeltrace_iter_free_pos(struct trace_collection_pos *pos);
-
-/*
- * babeltrace_iter_seek: seek iterator to given position.
- *
- * Return EOF if position is after the last event of the trace collection.
- * Return other negative value for other errors.
- * Return 0 for success.
- */
-int babeltrace_iter_seek(struct babeltrace_iter *iter,
-		const struct trace_collection_pos *pos);
-
-/*
- * babeltrace_iter_read_event: Read the iterator's current event data.
- *
- * @iter: trace collection iterator (input)
- * @stream: stream containing event at current position (output)
- * @event: current event (output)
- * Return 0 on success, negative error value on error.
- */
-int babeltrace_iter_read_event(struct babeltrace_iter *iter,
-		struct ctf_stream **stream,
-		struct ctf_stream_event **event);
+#include <babeltrace/context.h>
+#include <babeltrace/format.h>
+#include <babeltrace/iterator.h>
+#include <babeltrace/trace-collection.h>
+#include <babeltrace/trace-handle.h>
 
 #endif /* _BABELTRACE_H */