X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=fc5d5ef14dfdf02a1dbb62f63b46c76fa22c1150;hp=8bcf27d2c99166393cfa035ed644b4cd267e60df;hb=32dd26fbc3c69fe677a7917535e10ace066e674c;hpb=00e2e675d54dc726a7c8f8887c889cc8ef022003

diff --git a/src/common/consumer.h b/src/common/consumer.h
index 8bcf27d2c..fc5d5ef14 100644
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef _LTTNG_CONSUMER_H
-#define _LTTNG_CONSUMER_H
+#ifndef LIB_CONSUMER_H
+#define LIB_CONSUMER_H
 
 #include <limits.h>
 #include <poll.h>
@@ -54,6 +54,8 @@ enum lttng_consumer_command {
 	/* inform the consumer to quit when all fd has hang up */
 	LTTNG_CONSUMER_STOP,
 	LTTNG_CONSUMER_ADD_RELAYD_SOCKET,
+	/* Inform the consumer to kill a specific relayd connection */
+	LTTNG_CONSUMER_DESTROY_RELAYD,
 };
 
 /* State of each fd in consumer */
@@ -128,6 +130,8 @@ struct lttng_consumer_stream {
 	unsigned int metadata_flag;
 	/* Used when the stream is set for network streaming */
 	uint64_t relayd_stream_id;
+	/* Next sequence number to use for trace packet */
+	uint64_t next_net_seq_num;
 };
 
 /*
@@ -138,9 +142,30 @@ struct consumer_relayd_sock_pair {
 	int net_seq_idx;
 	/* Number of stream associated with this relayd */
 	unsigned int refcount;
+
+	/*
+	 * This flag indicates whether or not we should destroy this object. The
+	 * destruction should ONLY occurs when this flag is set and the refcount is
+	 * set to zero.
+	 */
+	unsigned int destroy_flag;
+
+	/*
+	 * Mutex protecting the control socket to avoid out of order packets
+	 * between threads sending data to the relayd. Since metadata data is sent
+	 * over that socket, at least two sendmsg() are needed (header + data)
+	 * creating a race for packets to overlap between threads using it.
+	 */
 	pthread_mutex_t ctrl_sock_mutex;
-	/* Sockets information */
+
+	/* Control socket. Command and metadata are passed over it */
 	struct lttcomm_sock control_sock;
+
+	/*
+	 * We don't need a mutex at this point since we only splice or write single
+	 * large chunk of data with a header appended at the begining. Moreover,
+	 * this socket is for now only used in a single thread.
+	 */
 	struct lttcomm_sock data_sock;
 	struct lttng_ht_node_ulong node;
 };
@@ -326,6 +351,7 @@ struct consumer_relayd_sock_pair *consumer_allocate_relayd_sock_pair(
 struct consumer_relayd_sock_pair *consumer_find_relayd(int key);
 int consumer_handle_stream_before_relayd(struct lttng_consumer_stream *stream,
 		size_t data_size);
+void consumer_destroy_relayd(struct consumer_relayd_sock_pair *relayd);
 
 extern struct lttng_consumer_local_data *lttng_consumer_create(
 		enum lttng_consumer_type type,
@@ -355,5 +381,10 @@ extern int lttng_consumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		struct lttng_consumer_local_data *ctx);
 int lttng_consumer_on_recv_stream(struct lttng_consumer_stream *stream);
+int consumer_add_relayd_socket(int net_seq_idx, int sock_type,
+		struct lttng_consumer_local_data *ctx, int sock,
+		struct pollfd *consumer_sockpoll, struct lttcomm_sock *relayd_sock);
+void consumer_flag_relayd_for_destroy(
+		struct consumer_relayd_sock_pair *relayd);
 
-#endif /* _LTTNG_CONSUMER_H */
+#endif /* LIB_CONSUMER_H */