X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=f8706d0ba88528e3dbf1e698de96eec9c4d5073d;hp=04d7efe5494443ab18dfea64d5e67561616fd66b;hb=16aa001d9a342adc6b913f854c0cee7a896a7e03;hpb=41c7a76dffd503f0e4677bc8f88633318066d888

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 04d7efe54..f8706d0ba 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -775,10 +775,19 @@ static int flush_channel(uint64_t chan_key)
 		health_code_update();
 
 		pthread_mutex_lock(&stream->lock);
+
+		/*
+		 * Protect against concurrent teardown of a stream.
+		 */
+		if (cds_lfht_is_node_deleted(&stream->node.node)) {
+			goto next;
+		}
+
 		if (!stream->quiescent) {
 			ustctl_flush_buffer(stream->ustream, 0);
 			stream->quiescent = true;
 		}
+next:
 		pthread_mutex_unlock(&stream->lock);
 	}
 error:
@@ -1070,7 +1079,6 @@ error_stream:
 	 * Clean up the stream completly because the next snapshot will use a new
 	 * metadata stream.
 	 */
-	pthread_mutex_lock(&metadata_stream->lock);
 	consumer_stream_destroy(metadata_stream, NULL);
 	cds_list_del(&metadata_stream->send_node);
 	metadata_channel->metadata_stream = NULL;
@@ -2096,6 +2104,9 @@ end_rotate_channel_nosignal:
 				msg.u.close_trace_chunk.close_command.value;
 		const uint64_t relayd_id =
 				msg.u.close_trace_chunk.relayd_id.value;
+		struct lttcomm_consumer_close_trace_chunk_reply reply;
+		char closed_trace_chunk_path[LTTNG_PATH_MAX];
+		int ret;
 
 		ret_code = lttng_consumer_close_trace_chunk(
 				msg.u.close_trace_chunk.relayd_id.is_set ?
@@ -2106,8 +2117,19 @@ end_rotate_channel_nosignal:
 				(time_t) msg.u.close_trace_chunk.close_timestamp,
 				msg.u.close_trace_chunk.close_command.is_set ?
 						&close_command :
-						NULL);
-		goto end_msg_sessiond;
+						NULL, closed_trace_chunk_path);
+		reply.ret_code = ret_code;
+		reply.path_length = strlen(closed_trace_chunk_path) + 1;
+		ret = lttcomm_send_unix_sock(sock, &reply, sizeof(reply));
+		if (ret != sizeof(reply)) {
+			goto error_fatal;
+		}
+		ret = lttcomm_send_unix_sock(sock, closed_trace_chunk_path,
+				reply.path_length);
+		if (ret != reply.path_length) {
+			goto error_fatal;
+		}
+		goto end_nosignal;
 	}
 	case LTTNG_CONSUMER_TRACE_CHUNK_EXISTS:
 	{
@@ -2401,62 +2423,69 @@ static int get_index_values(struct ctf_packet_index *index,
 		struct ustctl_consumer_stream *ustream)
 {
 	int ret;
+	uint64_t packet_size, content_size, timestamp_begin, timestamp_end,
+			events_discarded, stream_id, stream_instance_id,
+			packet_seq_num;
 
-	ret = ustctl_get_timestamp_begin(ustream, &index->timestamp_begin);
+	ret = ustctl_get_timestamp_begin(ustream, &timestamp_begin);
 	if (ret < 0) {
 		PERROR("ustctl_get_timestamp_begin");
 		goto error;
 	}
-	index->timestamp_begin = htobe64(index->timestamp_begin);
 
-	ret = ustctl_get_timestamp_end(ustream, &index->timestamp_end);
+	ret = ustctl_get_timestamp_end(ustream, &timestamp_end);
 	if (ret < 0) {
 		PERROR("ustctl_get_timestamp_end");
 		goto error;
 	}
-	index->timestamp_end = htobe64(index->timestamp_end);
 
-	ret = ustctl_get_events_discarded(ustream, &index->events_discarded);
+	ret = ustctl_get_events_discarded(ustream, &events_discarded);
 	if (ret < 0) {
 		PERROR("ustctl_get_events_discarded");
 		goto error;
 	}
-	index->events_discarded = htobe64(index->events_discarded);
 
-	ret = ustctl_get_content_size(ustream, &index->content_size);
+	ret = ustctl_get_content_size(ustream, &content_size);
 	if (ret < 0) {
 		PERROR("ustctl_get_content_size");
 		goto error;
 	}
-	index->content_size = htobe64(index->content_size);
 
-	ret = ustctl_get_packet_size(ustream, &index->packet_size);
+	ret = ustctl_get_packet_size(ustream, &packet_size);
 	if (ret < 0) {
 		PERROR("ustctl_get_packet_size");
 		goto error;
 	}
-	index->packet_size = htobe64(index->packet_size);
 
-	ret = ustctl_get_stream_id(ustream, &index->stream_id);
+	ret = ustctl_get_stream_id(ustream, &stream_id);
 	if (ret < 0) {
 		PERROR("ustctl_get_stream_id");
 		goto error;
 	}
-	index->stream_id = htobe64(index->stream_id);
 
-	ret = ustctl_get_instance_id(ustream, &index->stream_instance_id);
+	ret = ustctl_get_instance_id(ustream, &stream_instance_id);
 	if (ret < 0) {
 		PERROR("ustctl_get_instance_id");
 		goto error;
 	}
-	index->stream_instance_id = htobe64(index->stream_instance_id);
 
-	ret = ustctl_get_sequence_number(ustream, &index->packet_seq_num);
+	ret = ustctl_get_sequence_number(ustream, &packet_seq_num);
 	if (ret < 0) {
 		PERROR("ustctl_get_sequence_number");
 		goto error;
 	}
-	index->packet_seq_num = htobe64(index->packet_seq_num);
+
+	*index = (typeof(*index)) {
+		.offset = index->offset,
+		.packet_size = htobe64(packet_size),
+		.content_size = htobe64(content_size),
+		.timestamp_begin = htobe64(timestamp_begin),
+		.timestamp_end = htobe64(timestamp_end),
+		.events_discarded = htobe64(events_discarded),
+		.stream_id = htobe64(stream_id),
+		.stream_instance_id = htobe64(stream_instance_id),
+		.packet_seq_num = htobe64(packet_seq_num),
+	};
 
 error:
 	return ret;
@@ -3031,7 +3060,7 @@ end:
  * Stop a given metadata channel timer if enabled and close the wait fd which
  * is the poll pipe of the metadata stream.
  *
- * This MUST be called with the metadata channel acquired.
+ * This MUST be called with the metadata channel lock acquired.
  */
 void lttng_ustconsumer_close_metadata(struct lttng_consumer_channel *metadata)
 {