API fix: Move ctf iterator API members to new babeltrace/ctf/iterator.h

They did not belong in babeltrace/ctf/event.h.

(Closes #161)

Reported-by: Yannick Brosseau <yannick.brosseau@gmail.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 6905070a25a062ed50aff09fc54537fb302b64dd..54efdfe0b0aa288be3ec47ef6c85b7182f484634 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -25,6 +25,7 @@
 #include <babeltrace/context.h>
 #include <babeltrace/ctf/types.h>
 #include <babeltrace/ctf/events.h>
+#include <babeltrace/ctf/iterator.h>
 #include <babeltrace/ctf-text/types.h>
 #include <babeltrace/iterator.h>
 #include <popt.h>

diff --git a/include/Makefile.am b/include/Makefile.am
index 24826263aa496d20955f6d47a4fccbb95a74eb7a..1fb0b5776556fe1c4cb3d2b561fe315ca13cfff1 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -8,8 +8,9 @@ babeltraceinclude_HEADERS = \
        babeltrace/list.h
 
 babeltracectfinclude_HEADERS = \
-       babeltrace/ctf/events.h \
-       babeltrace/ctf/callbacks.h
+       babeltrace/ctf/events.h \
+       babeltrace/ctf/callbacks.h \
+       babeltrace/ctf/iterator.h
 
 noinst_HEADERS = \
        babeltrace/align.h \

diff --git a/include/babeltrace/ctf/events.h b/include/babeltrace/ctf/events.h
index a08518b8a0e0aad7cc29485a283508816d4626e4..d0ec3e10615b3beefcee75bff226cc58431eacc0 100644 (file)
--- a/include/babeltrace/ctf/events.h
+++ b/include/babeltrace/ctf/events.h
@@ -24,12 +24,10 @@
  */
 
 #include <stdint.h>
-#include <babeltrace/iterator.h>
 
 struct ctf_stream;
 struct ctf_stream_event;
 struct definition;
-struct bt_ctf_iter;
 
 /*
  * the top-level scopes in CTF
@@ -78,42 +76,6 @@ struct bt_ctf_event {
        struct ctf_stream_event *event;
 };
 
-/*
- * bt_ctf_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.
- */
-struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter);
-
-/*
- * bt_ctf_iter_create - Allocate a CTF 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_ctf_iter *bt_ctf_iter_create(struct bt_context *ctx,
-               struct bt_iter_pos *begin_pos,
-               struct bt_iter_pos *end_pos);
-
-/*
- * bt_ctf_get_iter - get iterator from ctf iterator.
- */
-struct bt_iter *bt_ctf_get_iter(struct bt_ctf_iter *iter);
-
-/*
- * bt_ctf_iter_destroy - Free a CTF trace collection iterator.
- */
-void bt_ctf_iter_destroy(struct bt_ctf_iter *iter);
-
 /*
  * bt_ctf_get_top_level_scope: return a definition of the top-level scope
  *