X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.h;h=01548cd17f088bfab82e6bd57082ed2ff87c1510;hb=f50f23d9f80ed9fae7fe5c49aee65e813e0031c8;hp=ab1765c48618b4b43064707e7884820ed66111bb;hpb=173af62f4804133d4a7f45e34b6f72126f3eca5f;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h
index ab1765c48..01548cd17 100644
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -18,8 +18,6 @@
 #ifndef _CONSUMER_H
 #define _CONSUMER_H
 
-#include <semaphore.h>
-
 #include <common/consumer.h>
 #include <common/hashtable/hashtable.h>
 #include <lttng/lttng.h>
@@ -38,6 +36,15 @@ struct consumer_socket {
 	 * To use this socket (send/recv), this lock MUST be acquired.
 	 */
 	pthread_mutex_t *lock;
+
+	/*
+	 * Indicates if the socket was registered by a third part
+	 * (REGISTER_CONSUMER) or is the spawn consumer of the session daemon.
+	 * During the destroy phase of a consumer output, we close the socket if
+	 * this flag is set to 1 since we don't need the fd anymore.
+	 */
+	unsigned int registered;
+
 	struct lttng_ht_node_ulong node;
 };
 
@@ -45,7 +52,24 @@ struct consumer_data {
 	enum lttng_consumer_type type;
 
 	pthread_t thread;	/* Worker thread interacting with the consumer */
-	sem_t sem;
+
+	/* Conditions used by the consumer thread to indicate readiness. */
+	pthread_cond_t cond;
+	pthread_condattr_t condattr;
+	pthread_mutex_t cond_mutex;
+
+	/*
+	 * This is a flag condition indicating that the consumer thread is ready
+	 * and connected to the lttng-consumerd daemon. This flag MUST only be
+	 * updated by locking the condition mutex above or before spawning a
+	 * consumer thread.
+	 *
+	 * A value of 0 means that the thread is NOT ready. A value of 1 means that
+	 * the thread consumer did connect successfully to the lttng-consumerd
+	 * daemon. A negative value indicates that there is been an error and the
+	 * thread has likely quit.
+	 */
+	int consumer_thread_is_ready;
 
 	/* Mutex to control consumerd pid assignation */
 	pthread_mutex_t pid_mutex;
@@ -86,6 +110,10 @@ struct consumer_net {
 
 	/* Data path for network streaming. */
 	struct lttng_uri data;
+
+	/* Flag if network sockets were sent to the consumer. */
+	unsigned int control_sock_sent;
+	unsigned int data_sock_sent;
 };
 
 /*
@@ -98,8 +126,8 @@ struct consumer_output {
 
 	/*
 	 * The net_seq_index is the index of the network stream on the consumer
-	 * side. It's basically the relayd socket file descriptor value so the
-	 * consumer can identify which streams goes with which socket.
+	 * side. It tells the consumer which streams goes to which relayd with this
+	 * index. The relayd sockets are index with it on the consumer side.
 	 */
 	int net_seq_index;
 
@@ -135,15 +163,23 @@ struct consumer_output *consumer_copy_output(struct consumer_output *obj);
 void consumer_destroy_output(struct consumer_output *obj);
 int consumer_set_network_uri(struct consumer_output *obj,
 		struct lttng_uri *uri);
-int consumer_send_fds(int sock, int *fds, size_t nb_fd);
-int consumer_send_stream(int sock, struct consumer_output *dst,
-		struct lttcomm_consumer_msg *msg, int *fds, size_t nb_fd);
-int consumer_send_channel(int sock, struct lttcomm_consumer_msg *msg);
-int consumer_send_relayd_socket(int consumer_sock,
+int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd);
+int consumer_send_stream(struct consumer_socket *sock,
+		struct consumer_output *dst, struct lttcomm_consumer_msg *msg,
+		int *fds, size_t nb_fd);
+int consumer_send_channel(struct consumer_socket *sock,
+		struct lttcomm_consumer_msg *msg);
+int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 		struct lttcomm_sock *sock, struct consumer_output *consumer,
 		enum lttng_stream_type type);
 int consumer_send_destroy_relayd(struct consumer_socket *sock,
 		struct consumer_output *consumer);
+int consumer_recv_status_reply(struct consumer_socket *sock);
+void consumer_output_send_destroy_relayd(struct consumer_output *consumer);
+int consumer_create_socket(struct consumer_data *data,
+		struct consumer_output *output);
+int consumer_set_subdir(struct consumer_output *consumer,
+		const char *session_name);
 
 void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg,
 		enum lttng_consumer_command cmd,
@@ -157,12 +193,16 @@ void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg,
 		int net_index,
 		unsigned int metadata_flag,
 		const char *name,
-		const char *pathname);
+		const char *pathname,
+		unsigned int session_id);
 void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		enum lttng_consumer_command cmd,
 		int channel_key,
 		uint64_t max_sb_size,
 		uint64_t mmap_len,
-		const char *name);
+		const char *name,
+		unsigned int nb_init_streams);
+int consumer_is_data_pending(unsigned int id,
+		struct consumer_output *consumer);
 
 #endif /* _CONSUMER_H */