X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flttng-relayd.h;h=e6ca5ebbb2b7dcbfb9f9bdb9a4d302d70c2e3475;hb=fe4477ee14abb348ce9e167f8b4c09312d67de36;hp=dfbc63f399e16cb2e9503a6513f1a91707583ec7;hpb=b8aa16822f579a6e15b41d2761801a0a65d5f2a5;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/lttng-relayd.h b/src/bin/lttng-relayd/lttng-relayd.h
index dfbc63f39..e6ca5ebbb 100644
--- 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 {
@@ -40,9 +40,16 @@ enum connection_type {
  * Represents a session for the relay point of view
  */
 struct relay_session {
+	/*
+	 * This session id is used to identify a set of stream to a tracing session
+	 * but also make sure we have a unique session id associated with a session
+	 * daemon which can provide multiple data source.
+	 */
 	uint64_t id;
 	struct lttcomm_sock *sock;
-	unsigned int version_check_done:1;
+	/* protocol version to use for this session */
+	uint32_t major;
+	uint32_t minor;
 };
 
 /*
@@ -50,10 +57,17 @@ struct relay_session {
  */
 struct relay_stream {
 	uint64_t stream_handle;
+	uint64_t prev_seq;	/* previous data sequence number encountered */
 	struct lttng_ht_node_ulong stream_n;
-	int fd;
-	uint64_t seq;
 	struct relay_session *session;
+	struct rcu_head rcu_node;
+	int fd;
+
+	/* Information telling us when to close the stream  */
+	unsigned int close_flag:1;
+	uint64_t last_net_seq_num;
+	/* Indicate if the stream was initialized for a data pending command. */
+	unsigned int data_pending_check_done:1;
 };
 
 /*
@@ -62,10 +76,12 @@ 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;
+	unsigned int version_check_done:1;
 };
 
-#endif
+#endif /* LTTNG_RELAYD_H */