Change wfq usages for wfcq

[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 e21f6d0126c66bf3903683e4caadb8b1078ab557..f3fb750a93e517899f9ee451c9f2f3d8c1421643 100644 (file)
--- 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,
@@ -20,7 +21,7 @@
 
 #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 +29,7 @@
 
 #include "session.h"
 #include "ust-app.h"
+#include "version.h"
 
 extern const char default_home_dir[],
        default_tracing_group[],
@@ -53,7 +55,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 +64,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;
 };
 
 /*
@@ -108,9 +111,19 @@ extern long page_size;
  */
 extern unsigned int jul_tcp_port;
 
+/*
+ * 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;
+
 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);
 
+void sessiond_notify_ready(void);
+
 #endif /* _LTT_SESSIOND_H */