X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry-channel.cpp;h=f4c8f226e09f104b33b7142a16d1b59fe8878425;hb=HEAD;hp=ceba9a8963ab333bd381e6a6a6e87a6419be1ae6;hpb=28ab034a2c3582d07d3423d2d746731f87d3969f;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-registry-channel.cpp b/src/bin/lttng-sessiond/ust-registry-channel.cpp
index ceba9a896..f4c8f226e 100644
--- a/src/bin/lttng-sessiond/ust-registry-channel.cpp
+++ b/src/bin/lttng-sessiond/ust-registry-channel.cpp
@@ -16,6 +16,8 @@
 #include <common/make-unique.hpp>
 #include <common/urcu.hpp>
 
+#include <utility>
+
 namespace lst = lttng::sessiond::trace;
 namespace lsu = lttng::sessiond::ust;
 
@@ -342,8 +344,8 @@ lsu::registry_channel::registry_channel(
 	_key{ -1ULL },
 	_consumer_key{ -1ULL },
 	_next_event_id{ 0 },
-	_is_registered_listener{ channel_registered_listener },
-	_event_added_listener{ event_added_listener },
+	_is_registered_listener{ std::move(channel_registered_listener) },
+	_event_added_listener{ std::move(event_added_listener) },
 	_is_registered{ false }
 {
 	_events = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
@@ -386,14 +388,14 @@ void lsu::registry_channel::add_event(int session_objd,
 	 * external party, don't assert and simply validate values.
 	 */
 	if (session_objd < 0) {
-		LTTNG_THROW_INVALID_ARGUMENT_ERROR(fmt::format(
+		LTTNG_THROW_INVALID_ARGUMENT_ERROR(lttng::format(
 			"Invalid session object descriptor provided by application: session descriptor = {}, app = {}",
 			session_objd,
 			app));
 	}
 
 	if (channel_objd < 0) {
-		LTTNG_THROW_INVALID_ARGUMENT_ERROR(fmt::format(
+		LTTNG_THROW_INVALID_ARGUMENT_ERROR(lttng::format(
 			"Invalid channel object descriptor provided by application: channel descriptor = {}, app = {}",
 			channel_objd,
 			app));
@@ -401,7 +403,7 @@ void lsu::registry_channel::add_event(int session_objd,
 
 	/* Check if we've reached the maximum possible id. */
 	if (is_max_event_id(_next_event_id)) {
-		LTTNG_THROW_ERROR(fmt::format(
+		LTTNG_THROW_ERROR(lttng::format(
 			"Failed to allocate new event id (id would overflow): app = {}", app));
 	}
 
@@ -416,7 +418,7 @@ void lsu::registry_channel::add_event(int session_objd,
 					loglevel_value,
 					std::move(model_emf_uri)));
 
-	DBG3("%s", fmt::format("UST registry creating event: event = {}", *event).c_str());
+	DBG3("%s", lttng::format("UST registry creating event: event = {}", *event).c_str());
 
 	/*
 	 * This is an add unique with a custom match function for event. The node
@@ -437,7 +439,7 @@ void lsu::registry_channel::add_event(int session_objd,
 				nptr, &lttng::sessiond::ust::registry_event::_node);
 			event_id = existing_event->id;
 		} else {
-			LTTNG_THROW_INVALID_ARGUMENT_ERROR(fmt::format(
+			LTTNG_THROW_INVALID_ARGUMENT_ERROR(lttng::format(
 				"UST registry create event add unique failed for event: event = {}",
 				*event));
 		}
@@ -445,7 +447,7 @@ void lsu::registry_channel::add_event(int session_objd,
 		const auto& event_ref = *event;
 
 		/* Ownership transferred to _events hash table. */
-		event.release();
+		(void) event.release();
 
 		/* Request next event id if the node was successfully added. */
 		event_id = event_ref.id;