X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Flttng-sessiond.h;h=65ab37d59ec4ec5026cb72dc5bea18a7d5004dd0;hp=12126273c01122ab4b75c39c8c3c35b9b0a8a7e8;hb=5e97de0089e5a91e4dd8bae5aa7e1956597c508b;hpb=f43f95a9a82e01eed34593260d510bd32e2083ec

diff --git a/src/bin/lttng-sessiond/lttng-sessiond.h b/src/bin/lttng-sessiond/lttng-sessiond.h
index 12126273c..65ab37d59 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,7 @@
 
 #include "session.h"
 #include "ust-app.h"
+#include "version.h"
 
 extern const char default_home_dir[],
 	default_tracing_group[],
@@ -53,7 +54,7 @@ struct command_ctx {
 struct ust_command {
 	int sock;
 	struct ust_register_msg reg_msg;
-	struct cds_wfq_node node;
+	struct cds_wfcq_node node;
 };
 
 /*
@@ -62,7 +63,8 @@ struct ust_command {
  */
 struct ust_cmd_queue {
 	int32_t futex;
-	struct cds_wfq_queue queue;
+	struct cds_wfcq_head head;
+	struct cds_wfcq_tail tail;
 };
 
 /*
@@ -104,9 +106,12 @@ extern int ht_cleanup_pipe[2];
 extern long page_size;
 
 /*
- * Global set once in main(). JUL TCP port for registration.
+ * Global set once in main(). Agent TCP port for registration.
  */
-extern unsigned int jul_tcp_port;
+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.
@@ -116,9 +121,8 @@ extern const char * const config_section_name;
 /* Is this daemon root or not. */
 extern int is_root;
 
-int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size);
 int sessiond_check_thread_quit_pipe(int fd, uint32_t events);
-
-void *thread_ht_cleanup(void *data);
+int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size);
+void sessiond_notify_ready(void);
 
 #endif /* _LTT_SESSIOND_H */