Clean-up: move global sessiond symbols out of main.o

[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 d0150123c8bcae1fbdc5c1ccd947db75fc7607d8..f0bd98781987b96f12b185b4a5cc78037183f09d 100644 (file)
--- a/src/bin/lttng-sessiond/lttng-sessiond.h
+++ b/src/bin/lttng-sessiond/lttng-sessiond.h
@@ -19,7 +19,6 @@
 #ifndef _LTT_SESSIOND_H
 #define _LTT_SESSIOND_H
 
-#define _LGPL_SOURCE
 #include <urcu.h>
 #include <urcu/wfcqueue.h>
 
@@ -29,7 +28,8 @@
 
 #include "session.h"
 #include "ust-app.h"
-#include "version.h"
+#include "notification-thread.h"
+#include "sessiond-config.h"
 
 extern const char default_home_dir[],
        default_tracing_group[],
@@ -39,6 +39,9 @@ extern const char default_home_dir[],
 /* Set in main.c at boot time of the daemon */
 extern int kernel_tracer_fd;
 
+/* Notification thread handle. */
+extern struct notification_thread_handle *notification_thread_handle;
+
 /*
  * This contains extra data needed for processing a command received by the
  * session daemon from the lttng client.
@@ -59,7 +62,7 @@ struct ust_command {
 };
 
 /*
- * Queue used to enqueue UST registration request (ust_commant) and protected
+ * Queue used to enqueue UST registration request (ust_command) and synchronized
  * by a futex with a scheme N wakers / 1 waiters. See futex.c/.h
  */
 struct ust_cmd_queue {
@@ -103,27 +106,32 @@ extern int ht_cleanup_pipe[2];
 
 /*
  * Populated when the daemon starts with the current page size of the system.
+ * Set in main() with the current page size.
  */
 extern long page_size;
 
-/*
- * Global set once in main(). Agent TCP port for registration.
- */
-extern unsigned int agent_tcp_port;
+/* Application health monitoring */
+extern struct health_app *health_sessiond;
 
-/*
- * Section name to look for in the daemon configuration file.
- */
-extern const char * const config_section_name;
+extern struct sessiond_config config;
 
-/* Is this daemon root or not. */
-extern int is_root;
+extern int lttng_sessiond_ready;
 
-int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size);
-int sessiond_check_thread_quit_pipe(int fd, uint32_t events);
+extern int ust_consumerd64_fd, ust_consumerd32_fd;
 
-void *thread_ht_cleanup(void *data);
+/* Parent PID for --sig-parent option */
+extern pid_t ppid;
+/* Internal parent PID use with daemonize. */
+extern pid_t child_ppid;
 
+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_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);
 
 #endif /* _LTT_SESSIOND_H */