Refactoring: use an opaque lttng_tracker_id type

[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 5b6761f55c216801b4327e20347237bb3963c451..92f051c16ef744ce8eb42ecb31152e61f474f66f 100644 (file)
--- a/src/bin/lttng-sessiond/lttng-sessiond.h
+++ b/src/bin/lttng-sessiond/lttng-sessiond.h
@@ -25,7 +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 <common/uuid.h>
 
 #include "session.h"
 #include "ust-app.h"
@@ -75,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;
 
@@ -87,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;
@@ -165,7 +163,7 @@ 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);