*/
#include "common/assert.h"
+#include "cpp-common/bt2s/make-unique.hpp"
#include "../common/src/metadata/tsdl/decoder.hpp"
#include "file.hpp"
static ctf_fs_file::UP get_file(const bt2c::CStringView trace_path, const bt2c::Logger& logger)
{
- auto file = ctf_fs_file_create(logger);
+ auto file = bt2s::make_unique<ctf_fs_file>(logger);
if (!file) {
goto error;
const ctf::src::ClkClsCfg& clkClsCfg)
{
int ret = 0;
- bt2::TraceClass::Shared traceCls;
ctf_metadata_decoder_config decoder_config {ctf_fs_trace->logger};
decoder_config.self_comp = self_comp;
goto end;
}
- traceCls = ctf_metadata_decoder_get_ir_trace_class(ctf_fs_trace->metadata->decoder.get());
- if (traceCls) {
- ctf_fs_trace->metadata->trace_class = traceCls.release().libObjPtr();
- }
+ ctf_fs_trace->metadata->trace_class =
+ ctf_metadata_decoder_get_ir_trace_class(ctf_fs_trace->metadata->decoder.get());
BT_ASSERT(!self_comp || ctf_fs_trace->metadata->trace_class);
ctf_fs_trace->metadata->tc =
end:
return ret;
}
-
-int ctf_fs_metadata_init(struct ctf_fs_metadata *)
-{
- /* Nothing to initialize for the moment. */
- return 0;
-}
-
-void ctf_fs_metadata_fini(struct ctf_fs_metadata *metadata)
-{
- if (metadata->trace_class) {
- BT_TRACE_CLASS_PUT_REF_AND_RESET(metadata->trace_class);
- }
-
- metadata->decoder.reset();
-}