X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-stream.c;fp=src%2Fcommon%2Fconsumer%2Fconsumer-stream.c;h=b2a5d41fd94a0d7fc9fd5660f6c8aaceb2ad5a33;hp=f5ca6b71ea3de705bacee2a78fa15db5b260c6f6;hb=6d40f8fa6e8256c448ab3b3d279069a8749c716d;hpb=028ba70793261607f5e08f412326c843b45c1984

diff --git a/src/common/consumer/consumer-stream.c b/src/common/consumer/consumer-stream.c
index f5ca6b71e..b2a5d41fd 100644
--- a/src/common/consumer/consumer-stream.c
+++ b/src/common/consumer/consumer-stream.c
@@ -72,7 +72,7 @@ void consumer_stream_relayd_close(struct lttng_consumer_stream *stream,
 			stream->relayd_stream_id,
 			stream->next_net_seq_num - 1);
 	if (ret < 0) {
-		ERR("Relayd send close stream failed. Cleaning up relayd %" PRIu64 ".", relayd->net_seq_idx);
+		ERR("Relayd send close stream failed. Cleaning up relayd %" PRIu64 ".", relayd->id);
 		lttng_consumer_cleanup_relayd(relayd);
 	}
 	pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
@@ -82,7 +82,7 @@ void consumer_stream_relayd_close(struct lttng_consumer_stream *stream,
 			uatomic_read(&relayd->destroy_flag)) {
 		consumer_destroy_relayd(relayd);
 	}
-	stream->net_seq_idx = (uint64_t) -1ULL;
+	stream->relayd_id = (uint64_t) -1ULL;
 	stream->sent_to_relayd = 0;
 }
 
@@ -166,7 +166,7 @@ void consumer_stream_close(struct lttng_consumer_stream *stream)
 
 	/* Check and cleanup relayd if needed. */
 	rcu_read_lock();
-	relayd = consumer_find_relayd(stream->net_seq_idx);
+	relayd = consumer_find_relayd(stream->relayd_id);
 	if (relayd != NULL) {
 		consumer_stream_relayd_close(stream, relayd);
 	}
@@ -360,9 +360,9 @@ int consumer_stream_write_index(struct lttng_consumer_stream *stream,
 	assert(element);
 
 	rcu_read_lock();
-	if (stream->net_seq_idx != (uint64_t) -1ULL) {
+	if (stream->relayd_id != (uint64_t) -1ULL) {
 		struct consumer_relayd_sock_pair *relayd;
-		relayd = consumer_find_relayd(stream->net_seq_idx);
+		relayd = consumer_find_relayd(stream->relayd_id);
 		if (relayd) {
 			pthread_mutex_lock(&relayd->ctrl_sock_mutex);
 			ret = relayd_send_index(&relayd->control_sock, element,
@@ -372,14 +372,14 @@ int consumer_stream_write_index(struct lttng_consumer_stream *stream,
 				 * Communication error with lttng-relayd,
 				 * perform cleanup now
 				 */
-				ERR("Relayd send index failed. Cleaning up relayd %" PRIu64 ".", relayd->net_seq_idx);
+				ERR("Relayd send index failed. Cleaning up relayd %" PRIu64 ".", relayd->id);
 				lttng_consumer_cleanup_relayd(relayd);
 				ret = -1;
 			}
 			pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
 		} else {
 			ERR("Stream %" PRIu64 " relayd ID %" PRIu64 " unknown. Can't write index.",
-					stream->key, stream->net_seq_idx);
+					stream->key, stream->relayd_id);
 			ret = -1;
 		}
 	} else {