From deb8633409fd7a16a2a22eb616e74058aea3fdb1 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 7 Dec 2023 05:14:35 +0000 Subject: [PATCH] src.ctf.lttng-live: introduce lttng_live_trace::UP and use it Signed-off-by: Simon Marchi Change-Id: I0008ee962a004ac6e215a5ed32c15b6367fb245b Reviewed-on: https://review.lttng.org/c/babeltrace/+/8462 Reviewed-by: Philippe Proulx Reviewed-on: https://review.lttng.org/c/babeltrace/+/12378 Tested-by: jenkins --- src/plugins/ctf/lttng-live/lttng-live.cpp | 8 +++++--- src/plugins/ctf/lttng-live/lttng-live.hpp | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/plugins/ctf/lttng-live/lttng-live.cpp b/src/plugins/ctf/lttng-live/lttng-live.cpp index 85955bc7..b1d0cebb 100644 --- a/src/plugins/ctf/lttng-live/lttng-live.cpp +++ b/src/plugins/ctf/lttng-live/lttng-live.cpp @@ -102,13 +102,15 @@ static struct lttng_live_trace *lttng_live_create_trace(struct lttng_live_sessio BT_CPPLOGD_SPEC(session->logger, "Creating live trace: session-id={}, trace-id={}", session->id, trace_id); - lttng_live_trace *trace = new lttng_live_trace {session->logger}; + auto trace = bt2s::make_unique(session->logger); + trace->session = session; trace->id = trace_id; trace->metadata_stream_state = LTTNG_LIVE_METADATA_STREAM_STATE_NEEDED; - g_ptr_array_add(session->traces, trace); - return trace; + const auto ret = trace.get(); + g_ptr_array_add(session->traces, trace.release()); + return ret; } struct lttng_live_trace * diff --git a/src/plugins/ctf/lttng-live/lttng-live.hpp b/src/plugins/ctf/lttng-live/lttng-live.hpp index d8a0f2a7..f5ad573c 100644 --- a/src/plugins/ctf/lttng-live/lttng-live.hpp +++ b/src/plugins/ctf/lttng-live/lttng-live.hpp @@ -177,6 +177,8 @@ enum lttng_live_metadata_stream_state struct lttng_live_trace { + using UP = std::unique_ptr; + explicit lttng_live_trace(const bt2c::Logger& parentLogger) : logger {parentLogger, "PLUGIN/SRC.CTF.LTTNG-LIVE/TRACE"} { -- 2.34.1