X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=910f386d932f5a71924bd637b4a5a467abcd6e2f;hp=3aafb519380b334099d584b83ca17d9b201ed6e1;hb=d01178b6f6465443d7e6e1015aa7054e9d093e91;hpb=c6857fcff91346ea41a5e9ea9a1ab0fcdb19944c

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 3aafb5193..910f386d9 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -540,7 +540,6 @@ static int add_stream(struct lttng_consumer_stream *stream,
 		struct lttng_ht *ht)
 {
 	int ret = 0;
-	struct consumer_relayd_sock_pair *relayd;
 
 	assert(stream);
 	assert(ht);
@@ -566,12 +565,6 @@ static int add_stream(struct lttng_consumer_stream *stream,
 	 */
 	lttng_ht_add_u64(consumer_data.stream_list_ht, &stream->node_session_id);
 
-	/* Check and cleanup relayd */
-	relayd = consumer_find_relayd(stream->net_seq_idx);
-	if (relayd != NULL) {
-		uatomic_inc(&relayd->refcount);
-	}
-
 	/*
 	 * When nb_init_stream_left reaches 0, we don't need to trigger any action
 	 * in terms of destroying the associated channel, because the action that
@@ -709,6 +702,7 @@ int consumer_send_relayd_stream(struct lttng_consumer_stream *stream,
 			goto end;
 		}
 		uatomic_inc(&relayd->refcount);
+		stream->sent_to_relayd = 1;
 	} else {
 		ERR("Stream %" PRIu64 " relayd ID %" PRIu64 " unknown. Can't send it.",
 				stream->key, stream->net_seq_idx);
@@ -1969,7 +1963,6 @@ static int add_metadata_stream(struct lttng_consumer_stream *stream,
 		struct lttng_ht *ht)
 {
 	int ret = 0;
-	struct consumer_relayd_sock_pair *relayd;
 	struct lttng_ht_iter iter;
 	struct lttng_ht_node_u64 *node;
 
@@ -1996,12 +1989,6 @@ static int add_metadata_stream(struct lttng_consumer_stream *stream,
 	node = lttng_ht_iter_get_node_u64(&iter);
 	assert(!node);
 
-	/* Find relayd and, if one is found, increment refcount. */
-	relayd = consumer_find_relayd(stream->net_seq_idx);
-	if (relayd != NULL) {
-		uatomic_inc(&relayd->refcount);
-	}
-
 	/*
 	 * When nb_init_stream_left reaches 0, we don't need to trigger any action
 	 * in terms of destroying the associated channel, because the action that