lib: graph: add "self" and some "private" APIs

[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 093f360bc8892694d1f0f51a5be305a7e7e2561f..3a4daad8c62b00f0e010a7e48b41388633b1d94e 100644 (file)
--- a/plugins/ctf/fs-src/data-stream-file.h
+++ b/plugins/ctf/fs-src/data-stream-file.h
@@ -81,18 +81,23 @@ 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 {
-       /* Owned by this */
-       struct ctf_fs_file *file;
+       /* Weak */
+       struct ctf_fs_metadata *metadata;
+
+       /* Weak */
+       struct bt_self_notification_iterator *pc_notif_iter;
 
        /* Owned by this */
-       struct bt_stream *stream;
+       struct ctf_fs_file *file;
 
        /* Owned by this */
-       struct bt_clock_class_priority_map *cc_prio_map;
+       struct bt_private_stream *stream;
 
        /* Weak */
        struct bt_notif_iter *notif_iter;
@@ -123,21 +128,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_self_notification_iterator *pc_notif_iter,
                struct bt_notif_iter *notif_iter,
-               struct bt_stream *stream, const char *path);
+               struct bt_private_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_field **packet_header_field,
-               struct bt_field **packet_context_field);
+               struct bt_private_field **packet_header_field,
+               struct bt_private_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_private_notification **notif);
 
 BT_HIDDEN
 struct ctf_fs_ds_index *ctf_fs_ds_file_build_index(