/* Check if that file is already the one mapped. */
if (!data->file || data->file->file->path != index_entry->path) {
/* Destroy the previously used file. */
- ctf_fs_ds_file_destroy(data->file);
+ delete data->file;
/* Create the new file. */
data->file =
goto end;
}
- ctf_fs_ds_file_destroy(data->file);
+ delete data->file;
delete data;
error:
/* Do not touch "borrowed" file. */
- ctf_fs_ds_file_destroy(ds_file);
+ delete ds_file;
ds_file = NULL;
end:
return bt2s::make_unique<ctf_fs_ds_index>();
}
-void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file)
+ctf_fs_ds_file::~ctf_fs_ds_file()
{
- if (!ds_file) {
- return;
- }
-
- (void) ds_file_munmap(ds_file);
-
- delete ds_file;
+ (void) ds_file_munmap(this);
}
ctf_fs_ds_file_info::UP ctf_fs_ds_file_info_create(const char *path, int64_t begin_ns)
{
}
+ ctf_fs_ds_file(const ctf_fs_ds_file&) = delete;
+ ctf_fs_ds_file& operator=(const ctf_fs_ds_file&) = delete;
+ ~ctf_fs_ds_file();
+
bt2c::Logger logger;
/* Weak */
struct ctf_fs_ds_file *ctf_fs_ds_file_create(ctf_fs_trace *ctf_fs_trace, bt2::Stream::Shared stream,
const char *path, const bt2c::Logger& logger);
-void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *stream);
-
ctf_fs_ds_index::UP ctf_fs_ds_file_build_index(struct ctf_fs_ds_file *ds_file,
struct ctf_fs_ds_file_info *ds_file_info,
struct ctf_msg_iter *msg_iter);
ret = -1;
end:
- ctf_fs_ds_file_destroy(ds_file);
+ delete ds_file;
if (msg_iter) {
ctf_msg_iter_destroy(msg_iter);
}
end:
- if (ds_file) {
- ctf_fs_ds_file_destroy(ds_file);
- }
+ delete ds_file;
+
if (msg_iter) {
ctf_msg_iter_destroy(msg_iter);
}