}
static
-struct bt_private_stream *medop_borrow_stream(
- struct bt_private_stream_class *stream_class, int64_t stream_id,
+struct bt_stream *medop_borrow_stream(
+ struct bt_stream_class *stream_class, int64_t stream_id,
void *data)
{
struct ctf_fs_ds_file *ds_file = data;
- struct bt_private_stream_class *ds_file_stream_class;
- struct bt_private_stream *stream = NULL;
+ struct bt_stream_class *ds_file_stream_class;
+ struct bt_stream *stream = NULL;
- ds_file_stream_class = bt_private_stream_borrow_class(
+ ds_file_stream_class = bt_stream_borrow_class(
ds_file->stream);
if (stream_class != ds_file_stream_class) {
}
static
-int convert_cycles_to_ns(struct bt_private_clock_class *clock_class,
+int convert_cycles_to_ns(struct bt_clock_class *clock_class,
uint64_t cycles, int64_t *ns)
{
- return bt_clock_class_cycles_to_ns_from_origin(
- bt_clock_class_borrow_from_private(clock_class), cycles, ns);
+ return bt_clock_class_cycles_to_ns_from_origin(clock_class, cycles,
+ ns);
}
static
BT_HIDDEN
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_self_notification_iterator *pc_notif_iter,
struct bt_notif_iter *notif_iter,
- struct bt_private_stream *stream, const char *path)
+ struct bt_stream *stream, const char *path)
{
int ret;
const size_t page_size = bt_common_get_page_size();
goto error;
}
- ds_file->stream = bt_object_get_ref(stream);
+ ds_file->stream = stream;
+ bt_stream_get_ref(ds_file->stream);
ds_file->metadata = ctf_fs_trace->metadata;
g_string_assign(ds_file->file->path, path);
ret = ctf_fs_file_open(ds_file->file, "rb");
return;
}
- bt_object_put_ref(ds_file->stream);
+ bt_stream_put_ref(ds_file->stream);
(void) ds_file_munmap(ds_file);
if (ds_file->file) {
BT_HIDDEN
enum bt_notification_iterator_status ctf_fs_ds_file_next(
struct ctf_fs_ds_file *ds_file,
- struct bt_private_notification **notif)
+ struct bt_notification **notif)
{
enum bt_notif_iter_status notif_iter_status;
enum bt_notification_iterator_status status;
BT_HIDDEN
int ctf_fs_ds_file_borrow_packet_header_context_fields(
struct ctf_fs_ds_file *ds_file,
- struct bt_private_field **packet_header_field,
- struct bt_private_field **packet_context_field)
+ struct bt_field **packet_header_field,
+ struct bt_field **packet_context_field)
{
enum bt_notif_iter_status notif_iter_status;
int ret = 0;