X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Flttng-sessiond.h;h=bcc4259871c1ad0196799aa1ea1ec1b2db300775;hp=a0916c5663cdb4394f581f8c2abcaaec54fa8c45;hb=e6142f2e647e83238b1e399b1264e8adb05409f9;hpb=12744796179ed3bfa9c3b6e22bfdeabf2e6081bf

diff --git a/src/bin/lttng-sessiond/lttng-sessiond.h b/src/bin/lttng-sessiond/lttng-sessiond.h
index a0916c566..bcc425987 100644
--- a/src/bin/lttng-sessiond/lttng-sessiond.h
+++ b/src/bin/lttng-sessiond/lttng-sessiond.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2013 - Raphaël Beamonte <raphael.beamonte@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2 only,
@@ -18,9 +19,8 @@
 #ifndef _LTT_SESSIOND_H
 #define _LTT_SESSIOND_H
 
-#define _LGPL_SOURCE
 #include <urcu.h>
-#include <urcu/wfqueue.h>
+#include <urcu/wfcqueue.h>
 
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/compat/poll.h>
@@ -28,6 +28,9 @@
 
 #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[],
@@ -37,6 +40,8 @@ extern const char default_home_dir[],
 /* Set in main.c at boot time of the daemon */
 extern int kernel_tracer_fd;
 
+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.
@@ -53,16 +58,35 @@ struct command_ctx {
 struct ust_command {
 	int sock;
 	struct ust_register_msg reg_msg;
-	struct cds_wfq_node node;
+	struct cds_wfcq_node node;
 };
 
 /*
- * 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 {
 	int32_t futex;
-	struct cds_wfq_queue queue;
+	struct cds_wfcq_head head;
+	struct cds_wfcq_tail tail;
+};
+
+/*
+ * This is the wait queue containing wait nodes during the application
+ * registration process.
+ */
+struct ust_reg_wait_queue {
+	unsigned long count;
+	struct cds_list_head head;
+};
+
+/*
+ * Use by the dispatch registration to queue UST command socket to wait for the
+ * notify socket.
+ */
+struct ust_reg_wait_node {
+	struct ust_app *app;
+	struct cds_list_head head;
 };
 
 /*
@@ -71,12 +95,35 @@ struct ust_cmd_queue {
  */
 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
+ * paths outside of large RCU read-side lock paths, and destroy cannot
+ * be called by call_rcu thread, because it may hang (waiting for
+ * call_rcu completion).
+ */
+extern int ht_cleanup_pipe[2];
+
 /*
  * Populated when the daemon starts with the current page size of the system.
  */
 extern long page_size;
 
-int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size);
+/* 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;
+
+/* Is this daemon root or not. */
+extern int is_root;
+
+extern struct sessiond_config config;
+
 int sessiond_check_thread_quit_pipe(int fd, uint32_t events);
+int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size);
+void sessiond_notify_ready(void);
 
 #endif /* _LTT_SESSIOND_H */