From 6954b97e32145f8bc34cea22c4ce4fd17abbcb96 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 11 Dec 2023 12:25:19 -0500 Subject: [PATCH] ctf: make ctf_trace_class_configure_ir_trace use bt2::Trace Use the bt2::Trace wrapper instead of a raw `bt_trace *`. Change the return type to void, since failures are now reported using exceptions. Change-Id: I2e30b0aa9a6f33e765ac32d274032ef4ab3aa9f8 Reviewed-on: https://review.lttng.org/c/babeltrace/+/8417 Reviewed-by: Philippe Proulx Reviewed-on: https://review.lttng.org/c/babeltrace/+/12353 Tested-by: jenkins CI-Build: Simon Marchi --- .../tsdl/ctf-meta-configure-ir-trace.cpp | 21 +++++-------------- .../tsdl/ctf-meta-configure-ir-trace.hpp | 4 ++-- src/plugins/ctf/fs-src/fs.cpp | 6 +----- src/plugins/ctf/lttng-live/metadata.cpp | 8 +++---- 4 files changed, 11 insertions(+), 28 deletions(-) diff --git a/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.cpp b/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.cpp index eb252def..dbcbbbd8 100644 --- a/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.cpp +++ b/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.cpp @@ -6,21 +6,19 @@ #include -#include "common/assert.h" +#include "cpp-common/bt2c/uuid.hpp" #include "ctf-meta-configure-ir-trace.hpp" #include "plugins/ctf/common/src/metadata/tsdl/ctf-meta.hpp" -int ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, bt_trace *ir_trace) +void ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, const bt2::Trace ir_trace) { - int ret = 0; uint64_t i; BT_ASSERT(tc); - BT_ASSERT(ir_trace); if (tc->is_uuid_set) { - bt_trace_set_uuid(ir_trace, tc->uuid); + ir_trace.uuid(bt2c::Uuid {tc->uuid}); } for (i = 0; i < tc->env_entries->len; i++) { @@ -29,22 +27,13 @@ int ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, bt_trace *ir_ switch (env_entry->type) { case CTF_TRACE_CLASS_ENV_ENTRY_TYPE_INT: - ret = bt_trace_set_environment_entry_integer(ir_trace, env_entry->name->str, - env_entry->value.i); + ir_trace.environmentEntry(env_entry->name->str, env_entry->value.i); break; case CTF_TRACE_CLASS_ENV_ENTRY_TYPE_STR: - ret = bt_trace_set_environment_entry_string(ir_trace, env_entry->name->str, - env_entry->value.str->str); + ir_trace.environmentEntry(env_entry->name->str, env_entry->value.str->str); break; default: bt_common_abort(); } - - if (ret) { - goto end; - } } - -end: - return ret; } diff --git a/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.hpp b/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.hpp index f94f19e6..2adffb53 100644 --- a/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.hpp +++ b/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.hpp @@ -7,8 +7,8 @@ #ifndef _CTF_META_CONFIGURE_IR_TRACE_H #define _CTF_META_CONFIGURE_IR_TRACE_H -#include +#include "cpp-common/bt2/trace-ir.hpp" -int ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, bt_trace *ir_trace); +void ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, bt2::Trace ir_trace); #endif /* _CTF_META_CONFIGURE_IR_TRACE_H */ diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp index 6123487d..df6a0e28 100644 --- a/src/plugins/ctf/fs-src/fs.cpp +++ b/src/plugins/ctf/fs-src/fs.cpp @@ -629,11 +629,7 @@ static ctf_fs_trace::UP ctf_fs_trace_create(const char *path, const char *name, } if (ctf_fs_trace->trace) { - ret = ctf_trace_class_configure_ir_trace(ctf_fs_trace->metadata->tc, - ctf_fs_trace->trace->libObjPtr()); - if (ret) { - return nullptr; - } + ctf_trace_class_configure_ir_trace(ctf_fs_trace->metadata->tc, *ctf_fs_trace->trace); ret = set_trace_name(ctf_fs_trace->trace->libObjPtr(), name); if (ret) { diff --git a/src/plugins/ctf/lttng-live/metadata.cpp b/src/plugins/ctf/lttng-live/metadata.cpp index 7f4bc768..b0a3c5e7 100644 --- a/src/plugins/ctf/lttng-live/metadata.cpp +++ b/src/plugins/ctf/lttng-live/metadata.cpp @@ -214,11 +214,9 @@ enum lttng_live_iterator_status lttng_live_metadata_update(struct lttng_live_tra BT_CPPLOGE_APPEND_CAUSE_SPEC(metadata->logger, "Failed to create bt_trace"); goto error; } - if (ctf_trace_class_configure_ir_trace(tc, trace->trace->libObjPtr())) { - BT_CPPLOGE_APPEND_CAUSE_SPEC(metadata->logger, - "Failed to configure ctf trace class"); - goto error; - } + + ctf_trace_class_configure_ir_trace(tc, *trace->trace); + if (!stream_classes_all_have_default_clock_class(trace->trace_class->libObjPtr(), metadata->logger)) { /* Error logged in function. */ -- 2.34.1