X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fdata-stream-file.c;h=0ca01a61606f67c5d831c7568bc42bc2dbf58916;hb=6de929550157bc46ee19fa5aaca3ea2e50a12c9e;hp=5d255ab78441ecf08bc882fc9ac4dbb3547c3672;hpb=7bd556d8dfc521775a439e93b50f3582041dc167;p=babeltrace.git diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c index 5d255ab7..0ca01a61 100644 --- a/plugins/ctf/fs-src/data-stream-file.c +++ b/plugins/ctf/fs-src/data-stream-file.c @@ -199,10 +199,12 @@ end: return stream; } -static struct bt_ctf_notif_iter_medium_ops medops = { +BT_HIDDEN +struct bt_ctf_notif_iter_medium_ops ctf_fs_ds_file_medops = { .request_bytes = medop_request_bytes, .get_stream = medop_get_stream, }; + static struct ctf_fs_ds_index *ctf_fs_ds_index_create(size_t length) { @@ -521,6 +523,7 @@ error: 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) { int ret; @@ -544,8 +547,8 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create( goto error; } - ds_file->notif_iter = bt_ctf_notif_iter_create( - ctf_fs_trace->metadata->trace, page_size, medops, ds_file); + ds_file->notif_iter = notif_iter; + bt_ctf_notif_iter_set_medops_data(ds_file->notif_iter, ds_file); if (!ds_file->notif_iter) { goto error; } @@ -585,10 +588,6 @@ void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file) ctf_fs_file_destroy(ds_file->file); } - if (ds_file->notif_iter) { - bt_ctf_notif_iter_destroy(ds_file->notif_iter); - } - g_free(ds_file); }