Trace IR and notification APIs: split into private and public APIs

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

diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c
index 9f7b7972f192f09dffc47681e32e5105518040e2..1e4356d66cc32009deae9fc917479eb8088981fe 100644 (file)
--- a/plugins/ctf/fs-src/data-stream-file.c
+++ b/plugins/ctf/fs-src/data-stream-file.c
@@ -173,15 +173,17 @@ end:
 }
 
 static
-struct bt_stream *medop_borrow_stream(
-               struct bt_stream_class *stream_class, int64_t stream_id,
+struct bt_private_stream *medop_borrow_stream(
+               struct bt_private_stream_class *stream_class, int64_t stream_id,
                void *data)
 {
        struct ctf_fs_ds_file *ds_file = data;
-       struct bt_stream_class *ds_file_stream_class;
-       struct bt_stream *stream = NULL;
+       struct bt_private_stream_class *ds_file_stream_class;
+       struct bt_private_stream *stream = NULL;
+
+       ds_file_stream_class = bt_private_stream_borrow_private_class(
+               ds_file->stream);
 
-       ds_file_stream_class = bt_stream_borrow_class(ds_file->stream);
        if (stream_class != ds_file_stream_class) {
                /*
                 * Not supported: two packets described by two different
@@ -291,10 +293,11 @@ struct ctf_fs_ds_index_entry *ctf_fs_ds_index_add_new_entry(
 }
 
 static
-int convert_cycles_to_ns(struct bt_clock_class *clock_class,
+int convert_cycles_to_ns(struct bt_private_clock_class *clock_class,
                uint64_t cycles, int64_t *ns)
 {
-       return bt_clock_class_cycles_to_ns_from_origin(clock_class, cycles, ns);
+       return bt_clock_class_cycles_to_ns_from_origin(
+               bt_clock_class_borrow_from_private(clock_class), cycles, ns);
 }
 
 static
@@ -623,7 +626,7 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create(
                struct ctf_fs_trace *ctf_fs_trace,
                struct bt_private_connection_private_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)
 {
        int ret;
        const size_t page_size = bt_common_get_page_size();
@@ -691,7 +694,6 @@ void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file)
                return;
        }
 
-       bt_object_put_ref(ds_file->cc_prio_map);
        bt_object_put_ref(ds_file->stream);
        (void) ds_file_munmap(ds_file);
 
@@ -705,7 +707,7 @@ void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file)
 BT_HIDDEN
 enum bt_notification_iterator_status ctf_fs_ds_file_next(
                struct ctf_fs_ds_file *ds_file,
-               struct bt_notification **notif)
+               struct bt_private_notification **notif)
 {
        enum bt_notif_iter_status notif_iter_status;
        enum bt_notification_iterator_status status;
@@ -739,8 +741,8 @@ enum bt_notification_iterator_status ctf_fs_ds_file_next(
 BT_HIDDEN
 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)
 {
        enum bt_notif_iter_status notif_iter_status;
        int ret = 0;