Fix: put ctf trace ht ref. inside stream

[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 da23240341a52b5f99dd1eaa0628b9be77b047eb..6fdcca29189edb7e70583326fcebf43d7f1fa9df 100644 (file)
--- a/src/bin/lttng-relayd/lttng-relayd.h
+++ b/src/bin/lttng-relayd/lttng-relayd.h
@@ -62,6 +62,16 @@ struct relay_session {
        struct rcu_head rcu_node;
        uint32_t viewer_attached;
        uint32_t stream_count;
+       /* Tell if this session is for a snapshot or not. */
+       unsigned int snapshot:1;
+
+       /*
+        * Indicate version protocol for this session. This is especially useful
+        * for the data thread that has no idea which version it operates on since
+        * linking control/data sockets is non trivial.
+        */
+       uint64_t minor;
+       uint64_t major;
 };
 
 /*
@@ -90,7 +100,15 @@ struct relay_stream {
        uint64_t total_index_received;
        struct relay_viewer_stream *viewer_stream;
        uint64_t last_net_seq_num;
+
+       /*
+        * This node is added to the *control* connection hash table and the
+        * pointer is copied in here so we can access it when deleting this object.
+        * When deleting this, the ctf trace ht MUST NOT be destroyed. This happens
+        * at connection deletion.
+        */
        struct lttng_ht_node_str ctf_trace_node;
+       struct lttng_ht *ctf_traces_ht;
 
        /*
         * To protect from concurrent read/update between the
@@ -156,6 +174,7 @@ struct relay_command {
        uint32_t major;
        uint32_t minor;
        struct lttng_ht *ctf_traces_ht; /* indexed by path name */
+       uint64_t session_id;
 };
 
 struct relay_local_data {
@@ -168,6 +187,8 @@ extern struct lttng_ht *relay_streams_ht;
 extern struct lttng_ht *viewer_streams_ht;
 extern struct lttng_ht *indexes_ht;
 
+extern const char *tracing_group_name;
+
 struct relay_stream *relay_stream_find_by_id(uint64_t stream_id);
 
 #endif /* LTTNG_RELAYD_H */