Fix: sessiond: no rotation performed from null chunk to new chunk

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

diff --git a/src/bin/lttng-sessiond/lttng-sessiond.h b/src/bin/lttng-sessiond/lttng-sessiond.h
index 243138a9f043311eb611318b0b2d058eda69587f..8846262b6b9916fbc14d89ea679fa1a5b3e8669c 100644 (file)
--- a/src/bin/lttng-sessiond/lttng-sessiond.h
+++ b/src/bin/lttng-sessiond/lttng-sessiond.h
@@ -25,6 +25,7 @@
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/compat/poll.h>
 #include <common/compat/socket.h>
+#include <common/compat/uuid.h>
 
 #include "session.h"
 #include "ust-app.h"
@@ -41,6 +42,9 @@ enum consumerd_state {
        CONSUMER_ERROR   = 3,
 };
 
+/* Unique identifier of a session daemon instance. */
+extern lttng_uuid sessiond_uuid;
+
 /*
  * This consumer daemon state is used to validate if a client command will be
  * able to reach the consumer. If not, the client is informed. For instance,
@@ -71,7 +75,6 @@ extern const char default_home_dir[],
        default_global_apps_pipe[];
 
 /* Set in main.c at boot time of the daemon */
-extern int kernel_tracer_fd;
 extern struct lttng_kernel_tracer_version kernel_tracer_version;
 extern struct lttng_kernel_tracer_abi_version kernel_tracer_abi_version;
 
@@ -83,7 +86,6 @@ extern struct notification_thread_handle *notification_thread_handle;
  * session daemon from the lttng client.
  */
 struct command_ctx {
-       int ust_sock;
        unsigned int lttng_msg_size;
        struct ltt_session *session;
        struct lttcomm_lttng_msg *llm;
@@ -125,12 +127,6 @@ struct ust_reg_wait_node {
        struct cds_list_head head;
 };
 
-/*
- * This pipe is used to inform the thread managing application notify
- * communication that a command is queued and ready to be processed.
- */
-extern int apps_cmd_notify_pipe[2];
-
 /*
  * Used to notify that a hash table needs to be destroyed by dedicated
  * thread. Required by design because we don't want to move destroy
@@ -153,8 +149,6 @@ extern struct health_app *health_sessiond;
 
 extern struct sessiond_config config;
 
-extern int lttng_sessiond_ready;
-
 extern int ust_consumerd64_fd, ust_consumerd32_fd;
 
 /* Parent PID for --sig-parent option */
@@ -169,12 +163,11 @@ extern struct consumer_data 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(unsigned int timeout_us);
+int sessiond_wait_for_quit_pipe(int timeout_ms);
 int sessiond_notify_quit_pipe(void);
 void sessiond_close_quit_pipe(void);
 
 int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size);
-void sessiond_notify_ready(void);
 void sessiond_signal_parents(void);
 
 void sessiond_set_client_thread_state(bool running);