Make API CTF-agnostic

[babeltrace.git] / plugins / ctf / fs-src / data-stream-file.h

diff --git a/plugins/ctf/fs-src/data-stream-file.h b/plugins/ctf/fs-src/data-stream-file.h
index 8c859e77472312a9edfa102824fdfd03bbb8aae2..075b8293ab7ca59a3469ace1c9f2cf96d640b6a6 100644 (file)
--- a/plugins/ctf/fs-src/data-stream-file.h
+++ b/plugins/ctf/fs-src/data-stream-file.h
@@ -27,7 +27,7 @@
 #include <stdbool.h>
 #include <glib.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ctf-ir/trace.h>
+#include <babeltrace/babeltrace.h>
 
 #include "../common/notif-iter/notif-iter.h"
 #include "lttng-index.h"
@@ -81,21 +81,29 @@ struct ctf_fs_ds_file_info {
        GString *path;
 
        /* Guaranteed to be set, as opposed to the index. */
-       uint64_t begin_ns;
+       int64_t begin_ns;
 };
 
+struct ctf_fs_metadata;
+
 struct ctf_fs_ds_file {
+       /* Weak */
+       struct ctf_fs_metadata *metadata;
+
+       /* Weak */
+       struct bt_private_connection_private_notification_iterator *pc_notif_iter;
+
        /* Owned by this */
        struct ctf_fs_file *file;
 
        /* Owned by this */
-       struct bt_ctf_stream *stream;
+       struct bt_stream *stream;
 
        /* Owned by this */
        struct bt_clock_class_priority_map *cc_prio_map;
 
        /* Weak */
-       struct bt_ctf_notif_iter *notif_iter;
+       struct bt_notif_iter *notif_iter;
 
        void *mmap_addr;
 
@@ -123,21 +131,23 @@ struct ctf_fs_ds_file {
 BT_HIDDEN
 struct ctf_fs_ds_file *ctf_fs_ds_file_create(
                struct ctf_fs_trace *ctf_fs_trace,
-               struct bt_ctf_notif_iter *notif_iter,
-               struct bt_ctf_stream *stream, const char *path);
+               struct bt_private_connection_private_notification_iterator *pc_notif_iter,
+               struct bt_notif_iter *notif_iter,
+               struct bt_stream *stream, const char *path);
 
 BT_HIDDEN
-int ctf_fs_ds_file_get_packet_header_context_fields(
+int ctf_fs_ds_file_borrow_packet_header_context_fields(
                struct ctf_fs_ds_file *ds_file,
-               struct bt_ctf_field **packet_header_field,
-               struct bt_ctf_field **packet_context_field);
+               struct bt_field **packet_header_field,
+               struct bt_field **packet_context_field);
 
 BT_HIDDEN
 void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *stream);
 
 BT_HIDDEN
-struct bt_notification_iterator_next_method_return ctf_fs_ds_file_next(
-               struct ctf_fs_ds_file *stream);
+enum bt_notification_iterator_status ctf_fs_ds_file_next(
+               struct ctf_fs_ds_file *ds_file,
+               struct bt_notification **notif);
 
 BT_HIDDEN
 struct ctf_fs_ds_index *ctf_fs_ds_file_build_index(
@@ -146,6 +156,6 @@ struct ctf_fs_ds_index *ctf_fs_ds_file_build_index(
 BT_HIDDEN
 void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index);
 
-extern struct bt_ctf_notif_iter_medium_ops ctf_fs_ds_file_medops;
+extern struct bt_notif_iter_medium_ops ctf_fs_ds_file_medops;
 
 #endif /* CTF_FS_DS_FILE_H */