X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Flttng-sessiond.h;h=f0bd98781987b96f12b185b4a5cc78037183f09d;hp=74552db6ee1c008a57ae12365705e2ef86ffa18d;hb=a7333da73c2083281c5ec833d041b7acf0d10d0b;hpb=e9404c27e7cc9d841785e6c4292c1add19fbc1cc

diff --git a/src/bin/lttng-sessiond/lttng-sessiond.h b/src/bin/lttng-sessiond/lttng-sessiond.h
index 74552db6e..f0bd98781 100644
--- a/src/bin/lttng-sessiond/lttng-sessiond.h
+++ b/src/bin/lttng-sessiond/lttng-sessiond.h
@@ -28,8 +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,7 @@ 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;
 
 /*
@@ -105,29 +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;
+
+extern int lttng_sessiond_ready;
 
-/* Is this daemon root or not. */
-extern int is_root;
+extern int ust_consumerd64_fd, ust_consumerd32_fd;
 
-extern const char *tracing_group_name;
+/* 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 */