Clean-up: modernize pretty_xml.cpp

[lttng-tools.git] / src / bin / lttng-sessiond / lttng-sessiond.hpp

diff --git a/src/bin/lttng-sessiond/lttng-sessiond.hpp b/src/bin/lttng-sessiond/lttng-sessiond.hpp
index fa4601d695405df8e1ad705d9aa0c31b525bda64..a10586bb891a80c5017245bb919a83775bffe51f 100644 (file)
--- a/src/bin/lttng-sessiond/lttng-sessiond.hpp
+++ b/src/bin/lttng-sessiond/lttng-sessiond.hpp
@@ -9,19 +9,20 @@
 #ifndef _LTT_SESSIOND_H
 #define _LTT_SESSIOND_H
 
-#include <urcu.h>
-#include <urcu/wfcqueue.h>
+#include "notification-thread.hpp"
+#include "rotation-thread.hpp"
+#include "session.hpp"
+#include "sessiond-config.hpp"
+#include "ust-app.hpp"
 
-#include <common/sessiond-comm/sessiond-comm.hpp>
-#include <common/payload.hpp>
 #include <common/compat/poll.hpp>
 #include <common/compat/socket.hpp>
+#include <common/payload.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
 #include <common/uuid.hpp>
 
-#include "session.hpp"
-#include "ust-app.hpp"
-#include "notification-thread.hpp"
-#include "sessiond-config.hpp"
+#include <urcu.h>
+#include <urcu/wfcqueue.h>
 
 /*
  * Consumer daemon state which is changed when spawning it, killing it or in
@@ -30,7 +31,7 @@
 enum consumerd_state {
        CONSUMER_STARTED = 1,
        CONSUMER_STOPPED = 2,
-       CONSUMER_ERROR   = 3,
+       CONSUMER_ERROR = 3,
 };
 
 /* Unique identifier of a session daemon instance. */
@@ -67,6 +68,9 @@ extern struct lttng_kernel_abi_tracer_abi_version the_kernel_tracer_abi_version;
 /* Notification thread handle. */
 extern struct notification_thread_handle *the_notification_thread_handle;
 
+/* Rotation thread handle. */
+extern lttng::sessiond::rotation_thread::uptr the_rotation_thread_handle;
+
 /*
  * This contains extra data needed for processing a command received by the
  * session daemon from the lttng client.
@@ -140,17 +144,16 @@ extern struct consumer_data the_ustconsumer32_data;
 extern struct consumer_data the_ustconsumer64_data;
 extern struct consumer_data the_kconsumer_data;
 
-int sessiond_init_thread_quit_pipe(void);
-int sessiond_check_thread_quit_pipe(int fd, uint32_t events);
-int sessiond_wait_for_quit_pipe(int timeout_ms);
-int sessiond_notify_quit_pipe(void);
-void sessiond_close_quit_pipe(void);
+int sessiond_init_main_quit_pipe();
+int sessiond_wait_for_main_quit_pipe(int timeout_ms);
+int sessiond_notify_main_quit_pipe();
+void sessiond_close_main_quit_pipe();
 
 int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size);
-void sessiond_signal_parents(void);
+void sessiond_signal_parents();
 
 void sessiond_set_client_thread_state(bool running);
-void sessiond_wait_client_thread_stopped(void);
+void sessiond_wait_client_thread_stopped();
 
 void *thread_manage_consumer(void *data);