X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=730eaf203102886b206aa5d267afc2f8bc9e98b6;hb=80e8027abb847655ebe43b2b5aec1a5141bb9668;hp=62e149ed2cbdaf574968cbbe93659c48c8907db3;hpb=c7759e6a503ebd197dd6a84de0eeaa52fbd0e81f;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 62e149ed2..730eaf203 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -61,6 +61,7 @@
 #include "lttng-relayd.h"
 #include "live.h"
 #include "health-relayd.h"
+#include "testpoint.h"
 
 /* command line options */
 char *opt_output_path;
@@ -90,7 +91,7 @@ const char * const config_section_name = "relayd";
  * Quit pipe for all threads. This permits a single cancellation point
  * for all threads when receiving an event on the pipe.
  */
-static int thread_quit_pipe[2] = { -1, -1 };
+int thread_quit_pipe[2] = { -1, -1 };
 
 /*
  * This pipe is used to inform the worker thread that a command is queued and
@@ -753,6 +754,10 @@ void *relay_thread_listener(void *data)
 
 	lttng_relay_notify_ready();
 
+	if (testpoint(relayd_thread_listener)) {
+		goto error_testpoint;
+	}
+
 	while (1) {
 		health_code_update();
 
@@ -853,6 +858,7 @@ restart:
 exit:
 error:
 error_poll_add:
+error_testpoint:
 	lttng_poll_clean(&events);
 error_create_poll:
 	if (data_sock->fd >= 0) {
@@ -896,6 +902,10 @@ void *relay_thread_dispatcher(void *data)
 
 	health_register(health_relayd, HEALTH_RELAYD_TYPE_DISPATCHER);
 
+	if (testpoint(relayd_thread_dispatcher)) {
+		goto error_testpoint;
+	}
+
 	health_code_update();
 
 	while (!CMM_LOAD_SHARED(dispatch_thread_exit)) {
@@ -942,6 +952,7 @@ void *relay_thread_dispatcher(void *data)
 	err = 0;
 
 error:
+error_testpoint:
 	if (err) {
 		health_error();
 		ERR("Health error occurred in %s", __func__);
@@ -1149,11 +1160,16 @@ int relay_create_session(struct lttcomm_relayd_hdr *recv_hdr,
 	session->sock = cmd->sock;
 	session->minor = cmd->minor;
 	session->major = cmd->major;
+	pthread_mutex_init(&session->viewer_ready_lock, NULL);
 	cmd->session = session;
 
 	reply.session_id = htobe64(session->id);
 
 	switch (cmd->minor) {
+		case 1:
+		case 2:
+		case 3:
+			break;
 		case 4: /* LTTng sessiond 2.4 */
 		default:
 			ret = cmd_create_session_2_4(cmd, session);
@@ -1192,6 +1208,8 @@ void set_viewer_ready_flag(struct relay_command *cmd)
 {
 	struct relay_stream_recv_handle *node, *tmp_node;
 
+	pthread_mutex_lock(&cmd->session->viewer_ready_lock);
+
 	cds_list_for_each_entry_safe(node, tmp_node, &cmd->recv_head, node) {
 		struct relay_stream *stream;
 
@@ -1214,6 +1232,7 @@ void set_viewer_ready_flag(struct relay_command *cmd)
 		free(node);
 	}
 
+	pthread_mutex_unlock(&cmd->session->viewer_ready_lock);
 	return;
 }
 
@@ -1335,11 +1354,7 @@ int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr,
 	 * stream message is received, this list is emptied and streams are set
 	 * with the viewer ready flag.
 	 */
-	if (stream->metadata_flag) {
-		stream->viewer_ready = 1;
-	} else {
-		queue_stream_handle(stream->stream_handle, cmd);
-	}
+	queue_stream_handle(stream->stream_handle, cmd);
 
 	lttng_ht_node_init_ulong(&stream->stream_n,
 			(unsigned long) stream->stream_handle);
@@ -2117,6 +2132,11 @@ int relay_streams_sent(struct lttcomm_relayd_hdr *recv_hdr,
 	 */
 	set_viewer_ready_flag(cmd);
 
+	/*
+	 * Inform the viewer that there are new streams in the session.
+	 */
+	uatomic_set(&cmd->session->new_streams, 1);
+
 	reply.ret_code = htobe32(LTTNG_OK);
 	send_ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0);
 	if (send_ret < 0) {
@@ -2560,6 +2580,10 @@ void *relay_thread_worker(void *data)
 
 	health_register(health_relayd, HEALTH_RELAYD_TYPE_WORKER);
 
+	if (testpoint(relayd_thread_worker)) {
+		goto error_testpoint;
+	}
+
 	health_code_update();
 
 	/* table of connections indexed on socket */
@@ -2821,6 +2845,7 @@ relay_connections_ht_error:
 	}
 	DBG("Worker thread cleanup complete");
 	free(data_buffer);
+error_testpoint:
 	if (err) {
 		health_error();
 		ERR("Health error occurred in %s", __func__);
@@ -2998,7 +3023,7 @@ int main(int argc, char **argv)
 		goto exit_listener;
 	}
 
-	ret = live_start_threads(live_uri, relay_ctx, thread_quit_pipe);
+	ret = live_start_threads(live_uri, relay_ctx);
 	if (ret != 0) {
 		ERR("Starting live viewer threads");
 		goto exit_live;