X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=a476dd5bf84fa5617df92ba603557e35b374f0ee;hp=2bcb0db24d88fed6419d21685023bf1dbe0ffccb;hb=f50f23d9f80ed9fae7fe5c49aee65e813e0031c8;hpb=cb365c03b0b4efc0d3f0875be586a8f4f270aaf6

diff --git a/src/common/consumer.h b/src/common/consumer.h
index 2bcb0db24..a476dd5bf 100644
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -132,10 +132,10 @@ struct lttng_consumer_stream {
 	/* Next sequence number to use for trace packet */
 	uint64_t next_net_seq_num;
 	/*
-	 * Lock to use the stream FDs since they are used between threads. Using
-	 * this lock with network streaming, when using the control mutex of a
-	 * consumer_relayd_sock_pair, make sure to acquire this lock BEFORE locking
-	 * it and releasing it AFTER the control mutex unlock.
+	 * Lock to use the stream FDs since they are used between threads.
+	 *
+	 * This is nested INSIDE the consumer_data lock.
+	 * This is nested OUTSIDE consumer_relayd_sock_pair lock.
 	 */
 	pthread_mutex_t lock;
 	/* Tracing session id */
@@ -170,6 +170,9 @@ struct consumer_relayd_sock_pair {
 	 * 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.
+	 *
+	 * This is nested INSIDE the consumer_data lock.
+	 * This is nested INSIDE the stream lock.
 	 */
 	pthread_mutex_t ctrl_sock_mutex;
 
@@ -257,8 +260,8 @@ struct lttng_consumer_global_data {
 	 * and number of element in the hash table. It's also a protection for
 	 * concurrent read/write between threads.
 	 *
-	 * XXX: We need to see if this lock is still needed with the lockless RCU
-	 * hash tables.
+	 * This is nested OUTSIDE the stream lock.
+	 * This is nested OUTSIDE the consumer_relayd_sock_pair lock.
 	 */
 	pthread_mutex_t lock;
 
@@ -293,10 +296,6 @@ struct lttng_consumer_global_data {
 	struct lttng_ht *stream_list_ht;
 };
 
-/* Defined in consumer.c and coupled with explanations */
-extern struct lttng_ht *metadata_ht;
-extern struct lttng_ht *data_ht;
-
 /*
  * Init consumer data structures.
  */
@@ -417,5 +416,6 @@ int consumer_add_relayd_socket(int net_seq_idx, int sock_type,
 void consumer_flag_relayd_for_destroy(
 		struct consumer_relayd_sock_pair *relayd);
 int consumer_data_pending(uint64_t id);
+int consumer_send_status_msg(int sock, int ret_code);
 
 #endif /* LIB_CONSUMER_H */