Introduce ctf_fs_metadata::UP and change the ctf_fs_trace::metadata
field to be of that type.
Change-Id: I0221ef7786cc8fb4c2e8a9264573ab5c2e5420d6
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8286
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12324
Tested-by: jenkins <jenkins@lttng.org>
}
ds_file->stream = std::move(stream);
- ds_file->metadata = ctf_fs_trace->metadata;
+ ds_file->metadata = ctf_fs_trace->metadata.get();
ds_file->file->path = path;
ret = ctf_fs_file_open(ds_file->file.get(), "rb");
if (ret) {
return;
}
- if (ctf_fs_trace->metadata) {
- delete ctf_fs_trace->metadata;
- }
-
delete ctf_fs_trace;
}
ctf_fs_trace::UP ctf_fs_trace {new struct ctf_fs_trace(parentLogger)};
ctf_fs_trace->path = path;
- ctf_fs_trace->metadata = new ctf_fs_metadata;
+ ctf_fs_trace->metadata = bt2s::make_unique<ctf_fs_metadata>();
ret = ctf_fs_metadata_set_trace_class(selfComp, ctf_fs_trace.get(), clkClsCfg);
if (ret) {
struct ctf_fs_metadata
{
+ using UP = std::unique_ptr<ctf_fs_metadata>;
+
/* Owned by this */
ctf_metadata_decoder_up decoder;
bt2c::Logger logger;
- /* Owned by this */
- struct ctf_fs_metadata *metadata = nullptr;
+ ctf_fs_metadata::UP metadata;
bt2::Trace::Shared trace;