X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.cpp;h=a26b38eebca970230f3a02d8bee8c9fdcba92bc0;hb=HEAD;hp=bc7893475c13c34e816427d1d358740655c53bb3;hpb=28f23191dcbf047429d51950a337a57d7a3f866a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/rotation-thread.cpp b/src/bin/lttng-sessiond/rotation-thread.cpp
index bc7893475..a26b38eeb 100644
--- a/src/bin/lttng-sessiond/rotation-thread.cpp
+++ b/src/bin/lttng-sessiond/rotation-thread.cpp
@@ -44,6 +44,7 @@
 #include <lttng/rotate-internal.hpp>
 #include <lttng/trigger/trigger.h>
 
+#include <fcntl.h>
 #include <inttypes.h>
 #include <memory>
 #include <signal.h>
@@ -67,9 +68,10 @@ struct ls::rotation_thread_timer_queue {
 
 namespace {
 struct rotation_thread_job {
-	using uptr = std::unique_ptr<
-		rotation_thread_job,
-		lttng::details::create_unique_class<rotation_thread_job, lttng::free>>;
+	using uptr =
+		std::unique_ptr<rotation_thread_job,
+				lttng::memory::create_deleter_class<rotation_thread_job,
+								    lttng::memory::free>::deleter>;
 
 	enum ls::rotation_thread_job_type type;
 	struct ltt_session *session;
@@ -395,8 +397,8 @@ void ls::rotation_thread_timer_queue_destroy(struct rotation_thread_timer_queue
 
 ls::rotation_thread::rotation_thread(rotation_thread_timer_queue& rotation_timer_queue,
 				     notification_thread_handle& notification_thread_handle) :
-	_rotation_timer_queue{ rotation_timer_queue },
-	_notification_thread_handle{ notification_thread_handle }
+	_rotation_timer_queue(rotation_timer_queue),
+	_notification_thread_handle(notification_thread_handle)
 {
 	_quit_pipe.reset([]() {
 		auto raw_pipe = lttng_pipe_open(FD_CLOEXEC);
@@ -751,8 +753,8 @@ void ls::rotation_thread::_run()
 			DBG_FMT("Handling descriptor activity: fd={}, events={:b}", fd, revents);
 
 			if (revents & LPOLLERR) {
-				LTTNG_THROW_ERROR(
-					fmt::format("Polling returned an error on fd: fd={}", fd));
+				LTTNG_THROW_ERROR(lttng::format(
+					"Polling returned an error on fd: fd={}", fd));
 			}
 
 			if (fd == _notification_channel->socket ||
@@ -788,7 +790,7 @@ void ls::rotation_thread::_run()
 
 					if (lttng_read(fd, &buf, 1) != 1) {
 						LTTNG_THROW_POSIX(
-							fmt::format(
+							lttng::format(
 								"Failed to read from wakeup pipe: fd={}",
 								fd),
 							errno);
@@ -848,14 +850,14 @@ void ls::rotation_thread::subscribe_session_consumed_size_rotation(ltt_session&
 	auto condition_status =
 		lttng_condition_session_consumed_size_set_threshold(rotate_condition.get(), size);
 	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
-		LTTNG_THROW_ERROR(fmt::format(
+		LTTNG_THROW_ERROR(lttng::format(
 			"Could not set session consumed size condition threshold: size={}", size));
 	}
 
 	condition_status = lttng_condition_session_consumed_size_set_session_name(
 		rotate_condition.get(), session.name);
 	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
-		LTTNG_THROW_ERROR(fmt::format(
+		LTTNG_THROW_ERROR(lttng::format(
 			"Could not set session consumed size condition session name: name=`{}`",
 			session.name));
 	}
@@ -894,7 +896,7 @@ void ls::rotation_thread::subscribe_session_consumed_size_rotation(ltt_session&
 		&_notification_thread_handle, trigger.get(), true);
 	if (register_ret != LTTNG_OK) {
 		LTTNG_THROW_CTL(
-			fmt::format(
+			lttng::format(
 				"Failed to register trigger for automatic size-based rotation: session_name{}, size={}",
 				session.name,
 				size),
@@ -918,7 +920,7 @@ void ls::rotation_thread::unsubscribe_session_consumed_size_rotation(ltt_session
 		_notification_channel.get(),
 		lttng_trigger_get_const_condition(session.rotate_trigger));
 	if (unsubscribe_status != LTTNG_NOTIFICATION_CHANNEL_STATUS_OK) {
-		LTTNG_THROW_ERROR(fmt::format(
+		LTTNG_THROW_ERROR(lttng::format(
 			"Failed to unsubscribe from consumed size condition used to control automatic size-based rotations: session_name=`{}` return_code={}",
 			session.name,
 			static_cast<int>(unsubscribe_status)));
@@ -934,7 +936,7 @@ void ls::rotation_thread::unsubscribe_session_consumed_size_rotation(ltt_session
 		&_notification_thread_handle, session.rotate_trigger);
 	if (unregister_status != LTTNG_OK) {
 		LTTNG_THROW_CTL(
-			fmt::format(
+			lttng::format(
 				"Failed to unregister trigger for automatic size-based rotation: session_name{}",
 				session.name),
 			unregister_status);