* all copies or substantial portions of the Software.
*/
-#include <glib.h>
+#include <babeltrace/context.h>
#include <babeltrace/format.h>
-
-typedef GQuark bt_event_name;
+#include <babeltrace/iterator.h>
+#include <babeltrace/trace-collection.h>
+#include <babeltrace/trace-handle.h>
+#include <babeltrace/ctf/events.h>
/* Forward declarations */
-struct babeltrace_iter;
+struct bt_iter;
struct ctf_stream_event;
struct ctf_stream;
struct bt_dependencies;
BT_CB_ERROR_CONTINUE = 3,
};
-struct bt_ctf_data {
- struct ctf_stream_event *event;
- struct ctf_stream *stream;
-};
-
/*
* Receives a variable number of strings as parameter, ended with NULL.
*/
/*
* struct bt_dependencies must be destroyed explicitly if not passed as
- * parameter to a babeltrace_iter_add_callback().
+ * parameter to a bt_iter_add_callback().
*/
void babeltrace_dependencies_destroy(struct bt_dependencies *dep);
/*
- * babeltrace_iter_add_callback: Add a callback to iterator.
+ * bt_iter_add_callback: Add a callback to iterator.
*
* @iter: trace collection iterator (input)
* @event: event to target. 0 for all events.
* destroyed, but they belong to the babeltrace library.
*
* (note to implementor: we need to keep a gptrarray of struct
- * bt_dependencies to "garbage collect" in struct babeltrace_iter, and
+ * bt_dependencies to "garbage collect" in struct bt_iter, and
* dependencies need to have a refcount to handle the case where they
* would be passed to more than one iterator. Upon iterator detroy, we
* iterate on all the gc ptrarray and decrement the refcounts, freeing
* if we reach 0.)
* (note to implementor: we calculate the dependency graph when
- * babeltrace_iter_read_event() is executed after a
- * babeltrace_iter_add_callback(). Beware that it is valid to create/add
+ * bt_iter_read_event() is executed after a
+ * bt_iter_add_callback(). Beware that it is valid to create/add
* callbacks/read/add more callbacks/read some more.)
*/
-int babeltrace_iter_add_callback(struct babeltrace_iter *iter,
- bt_event_name event, void *private_data, int flags,
- enum bt_cb_ret (*callback)(struct bt_ctf_data *ctf_data,
+int bt_iter_add_callback(struct bt_iter *iter,
+ bt_intern_str event, void *private_data, int flags,
+ enum bt_cb_ret (*callback)(struct bt_ctf_event *ctf_data,
void *caller_data),
struct bt_dependencies *depends,
struct bt_dependencies *weak_depends,