Introduce contexts

[babeltrace.git] / include / babeltrace / babeltrace.h

diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index eb15de005843f1044636d41941fd49b4b1eec8d1..792eeab08196b6c6b75efe39344973b2533912cf 100644 (file)
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -18,6 +18,9 @@
  */
 
 #include <glib.h>
+#include <stdint.h>
+#include <babeltrace/format.h>
+#include <babeltrace/context.h>
 
 typedef GQuark bt_event_name;
 
@@ -28,6 +31,7 @@ struct ctf_stream_event;
 struct ctf_stream;
 struct babeltrace_saved_pos;
 struct bt_dependencies;
+struct bt_context;
 
 enum bt_cb_ret {
        BT_CB_OK                = 0,
@@ -50,6 +54,11 @@ struct trace_collection_pos {
        } u;
 };
 
+struct bt_ctf_data {
+       struct ctf_stream_event *event;
+       struct ctf_stream *stream;
+};
+
 /*
  * babeltrace_iter_create - Allocate a trace collection iterator.
  *
@@ -62,7 +71,7 @@ struct trace_collection_pos {
  * 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 babeltrace_iter *babeltrace_iter_create(struct bt_context *ctx,
                struct trace_collection_pos *begin_pos,
                struct trace_collection_pos *end_pos);
 
@@ -162,8 +171,8 @@ void babeltrace_dependencies_destroy(struct bt_dependencies *dep);
  */
 int babeltrace_iter_add_callback(struct babeltrace_iter *iter,
                bt_event_name event, void *private_data, int flags,
-               enum bt_cb_ret (*callback)(void *private_data,
-                                       void *caller_data),
+               enum bt_cb_ret (*callback)(struct bt_ctf_data *ctf_data,
+                                          void *caller_data),
                struct bt_dependencies *depends,
                struct bt_dependencies *weak_depends,
                struct bt_dependencies *provides);