X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=506bbc6fb87249fe933cab9be2dfadb7f0a11d1c;hb=87e45c13276c771ae797eb84fa1e42c36cb8cde2;hp=71d11ebdfa2be05c640c869799f553b35b1ea97f;hpb=cd60b05aa790a1355e50fd0248f5dcf7a58b88c3;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 71d11ebdf..506bbc6fb 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -129,6 +129,7 @@ struct health_app *health_relayd;
 static struct option long_options[] = {
 	{ "control-port", 1, 0, 'C', },
 	{ "data-port", 1, 0, 'D', },
+	{ "live-port", 1, 0, 'L', },
 	{ "daemonize", 0, 0, 'd', },
 	{ "group", 1, 0, 'g', },
 	{ "help", 0, 0, 'h', },
@@ -151,6 +152,7 @@ void usage(void)
 	fprintf(stderr, "  -d, --daemonize           Start as a daemon.\n");
 	fprintf(stderr, "  -C, --control-port URL    Control port listening.\n");
 	fprintf(stderr, "  -D, --data-port URL       Data port listening.\n");
+	fprintf(stderr, "  -L, --live-port URL       Live view port listening.\n");
 	fprintf(stderr, "  -o, --output PATH         Output path for traces. Must use an absolute path.\n");
 	fprintf(stderr, "  -v, --verbose             Verbose mode. Activate DBG() macro.\n");
 	fprintf(stderr, "  -g, --group NAME          Specify the tracing group name. (default: tracing)\n");
@@ -195,6 +197,16 @@ int set_option(int opt, const char *arg, const char *optname)
 			data_uri->port = DEFAULT_NETWORK_DATA_PORT;
 		}
 		break;
+	case 'L':
+		ret = uri_parse(arg, &live_uri);
+		if (ret < 0) {
+			ERR("Invalid live URI specified");
+			goto end;
+		}
+		if (live_uri->port == 0) {
+			live_uri->port = DEFAULT_NETWORK_VIEWER_PORT;
+		}
+		break;
 	case 'd':
 		opt_daemon = 1;
 		break;
@@ -416,6 +428,7 @@ void cleanup(void)
 
 	uri_free(control_uri);
 	uri_free(data_uri);
+	/* Live URI is freed in the live thread. */
 
 	if (tracing_group_name_override) {
 		free((void *) tracing_group_name);
@@ -1134,6 +1147,61 @@ error:
 	return ret;
 }
 
+/*
+ * When we have received all the streams and the metadata for a channel,
+ * we make them visible to the viewer threads.
+ */
+static
+void set_viewer_ready_flag(struct relay_command *cmd)
+{
+	struct relay_stream_recv_handle *node, *tmp_node;
+
+	cds_list_for_each_entry_safe(node, tmp_node, &cmd->recv_head, node) {
+		struct relay_stream *stream;
+
+		rcu_read_lock();
+		stream = relay_stream_find_by_id(node->id);
+		if (!stream) {
+			/*
+			 * Stream is most probably being cleaned up by the data thread thus
+			 * simply continue to the next one.
+			 */
+			rcu_read_unlock();
+			continue;
+		}
+
+		stream->viewer_ready = 1;
+		rcu_read_unlock();
+
+		/* Clean stream handle node. */
+		cds_list_del(&node->node);
+		free(node);
+	}
+
+	return;
+}
+
+/*
+ * Add a recv handle node to the connection recv list with the given stream
+ * handle. A new node is allocated thus must be freed when the node is deleted
+ * from the list.
+ */
+static void queue_stream_handle(uint64_t handle, struct relay_command *cmd)
+{
+	struct relay_stream_recv_handle *node;
+
+	assert(cmd);
+
+	node = zmalloc(sizeof(*node));
+	if (!node) {
+		PERROR("zmalloc queue stream handle");
+		return;
+	}
+
+	node->id = handle;
+	cds_list_add(&node->node, &cmd->recv_head);
+}
+
 /*
  * relay_add_stream: allocate a new stream for a session
  */
@@ -1226,6 +1294,17 @@ int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr,
 	ctf_trace_assign(cmd->ctf_traces_ht, stream);
 	stream->ctf_traces_ht = cmd->ctf_traces_ht;
 
+	/*
+	 * Add the stream handle in the recv list of the connection. Once the end
+	 * 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);
+	}
+
 	lttng_ht_node_init_ulong(&stream->stream_n,
 			(unsigned long) stream->stream_handle);
 	lttng_ht_add_unique_ulong(relay_streams_ht,
@@ -1974,6 +2053,48 @@ end_no_session:
 	return ret;
 }
 
+/*
+ * Receive the streams_sent message.
+ *
+ * Return 0 on success else a negative value.
+ */
+static
+int relay_streams_sent(struct lttcomm_relayd_hdr *recv_hdr,
+		struct relay_command *cmd)
+{
+	int ret, send_ret;
+	struct lttcomm_relayd_generic_reply reply;
+
+	assert(cmd);
+
+	DBG("Relay receiving streams_sent");
+
+	if (!cmd->session || cmd->version_check_done == 0) {
+		ERR("Trying to close a stream before version check");
+		ret = -1;
+		goto end_no_session;
+	}
+
+	/*
+	 * Flag every pending stream in the connection recv list that they are
+	 * ready to be used by the viewer.
+	 */
+	set_viewer_ready_flag(cmd);
+
+	reply.ret_code = htobe32(LTTNG_OK);
+	send_ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0);
+	if (send_ret < 0) {
+		ERR("Relay sending sent_stream reply");
+		ret = send_ret;
+	} else {
+		/* Success. */
+		ret = 0;
+	}
+
+end_no_session:
+	return ret;
+}
+
 /*
  * Process the commands received on the control socket
  */
@@ -2017,6 +2138,9 @@ int relay_process_control(struct lttcomm_relayd_hdr *recv_hdr,
 	case RELAYD_SEND_INDEX:
 		ret = relay_recv_index(recv_hdr, cmd);
 		break;
+	case RELAYD_STREAMS_SENT:
+		ret = relay_streams_sent(recv_hdr, cmd);
+		break;
 	case RELAYD_UPDATE_SYNC_INFO:
 	default:
 		ERR("Received unknown command (%u)", be32toh(recv_hdr->cmd));
@@ -2309,6 +2433,7 @@ int relay_add_connection(int fd, struct lttng_poll_event *events,
 		PERROR("read relay cmd pipe");
 		goto error_read;
 	}
+	CDS_INIT_LIST_HEAD(&relay_connection->recv_head);
 
 	/*
 	 * Only used by the control side and the reference is copied inside each
@@ -2360,8 +2485,17 @@ void relay_del_connection(struct lttng_ht *relay_connections_ht,
 	assert(!ret);
 
 	if (relay_connection->type == RELAY_CONTROL) {
+		struct relay_stream_recv_handle *node, *tmp_node;
+
 		relay_delete_session(relay_connection, sessions_ht);
 		lttng_ht_destroy(relay_connection->ctf_traces_ht);
+
+		/* Clean up recv list. */
+		cds_list_for_each_entry_safe(node, tmp_node,
+				&relay_connection->recv_head, node) {
+			cds_list_del(&node->node);
+			free(node);
+		}
 	}
 
 	call_rcu(&relay_connection->rcu_node, deferred_free_connection);
@@ -2727,7 +2861,7 @@ int main(int argc, char **argv)
 
 	/* Check if daemon is UID = 0 */
 	if (relayd_uid == 0) {
-		if (control_uri->port < 1024 || data_uri->port < 1024) {
+		if (control_uri->port < 1024 || data_uri->port < 1024 || live_uri->port < 1024) {
 			ERR("Need to be root to use ports < 1024");
 			ret = -1;
 			goto exit;
@@ -2747,6 +2881,7 @@ int main(int argc, char **argv)
 
 	/* Initialize communication library */
 	lttcomm_init();
+	lttcomm_inet_init();
 
 	relay_ctx = zmalloc(sizeof(struct relay_local_data));
 	if (!relay_ctx) {