fix: lttng-relayd: use appropriate RCU locking with hash tables

[lttng-tools.git] / src / bin / lttng-relayd / lttng-relayd.h

diff --git a/src/bin/lttng-relayd/lttng-relayd.h b/src/bin/lttng-relayd/lttng-relayd.h
index dfbc63f399e16cb2e9503a6513f1a91707583ec7..bec13496ca26ab5944853bb0dacadebeb8b2436f 100644 (file)
--- a/src/bin/lttng-relayd/lttng-relayd.h
+++ b/src/bin/lttng-relayd/lttng-relayd.h
@@ -16,8 +16,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef _LTT_RELAYD_H
-#define _LTT_RELAYD_H
+#ifndef LTTNG_RELAYD_H
+#define LTTNG_RELAYD_H
 
 #define _LGPL_SOURCE
 #include <urcu.h>
@@ -27,8 +27,8 @@
  * Queue used to enqueue relay requests
  */
 struct relay_cmd_queue {
-       int32_t futex;
        struct cds_wfq_queue queue;
+       int32_t futex;
 };
 
 enum connection_type {
@@ -50,10 +50,11 @@ struct relay_session {
  */
 struct relay_stream {
        uint64_t stream_handle;
-       struct lttng_ht_node_ulong stream_n;
-       int fd;
        uint64_t seq;
+       struct lttng_ht_node_ulong stream_n;
        struct relay_session *session;
+       struct rcu_head rcu_node;
+       int fd;
 };
 
 /*
@@ -62,10 +63,11 @@ struct relay_stream {
  */
 struct relay_command {
        struct lttcomm_sock *sock;
+       struct relay_session *session;
        struct cds_wfq_node node;
        struct lttng_ht_node_ulong sock_n;
+       struct rcu_head rcu_node;
        enum connection_type type;
-       struct relay_session *session;
 };
 
-#endif
+#endif /* LTTNG_RELAYD_H */