Merge remote-tracking branch 'cbab-github/tests-cleanup' into cbab

[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 32963044f1e88fcde508654ad542e14e5bb17728..9258f38a7c1018d27ee91de0f3817f92efe90bd6 100644 (file)
--- a/src/bin/lttng-sessiond/lttng-sessiond.h
+++ b/src/bin/lttng-sessiond/lttng-sessiond.h
@@ -23,18 +23,20 @@
 #include <urcu/wfqueue.h>
 
 #include <common/sessiond-comm/sessiond-comm.h>
+#include <common/compat/poll.h>
 #include <common/compat/socket.h>
 
 #include "session.h"
 #include "ust-app.h"
 
-const char *module_proc_lttng = "/proc/lttng";
-
 extern const char default_home_dir[],
        default_tracing_group[],
        default_ust_sock_dir[],
        default_global_apps_pipe[];
 
+/* Set in main.c at boot time of the daemon */
+extern int kernel_tracer_fd;
+
 /*
  * This contains extra data needed for processing a command received by the
  * session daemon from the lttng client.
@@ -63,4 +65,13 @@ struct ust_cmd_queue {
        struct cds_wfq_queue queue;
 };
 
+/*
+ * 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];
+
+int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size);
+int sessiond_check_thread_quit_pipe(int fd, uint32_t events);
+
 #endif /* _LTT_SESSIOND_H */