X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=11706877a7f5b3f147034abcf106a0bb5e77c5d2;hb=4dbc372b53ef1ac713497164e7a8b92100db7ae2;hp=9e1a59f5e447558a127d5ceac8273417131dd59e;hpb=c80048c6378b9ee7796c4b833a2c07f6050cc6d7;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 9e1a59f5e..11706877a 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -190,9 +190,8 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			return ret;
 		}
 
-		DBG("consumer_add_stream chan %d stream %d",
-				msg.u.stream.channel_key,
-				msg.u.stream.stream_key);
+		DBG("Consumer command ADD_STREAM chan %d stream %d",
+				msg.u.stream.channel_key, msg.u.stream.stream_key);
 
 		assert(msg.u.stream.output == LTTNG_EVENT_MMAP);
 		new_stream = consumer_allocate_stream(msg.u.stream.channel_key,
@@ -235,39 +234,48 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 					&new_stream->relayd_stream_id);
 			pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
 			if (ret < 0) {
+				consumer_del_stream(new_stream, NULL);
 				goto end_nosignal;
 			}
 		} else if (msg.u.stream.net_index != -1) {
 			ERR("Network sequence index %d unknown. Not adding stream.",
 					msg.u.stream.net_index);
-			free(new_stream);
+			consumer_del_stream(new_stream, NULL);
 			goto end_nosignal;
 		}
 
-		/* Send stream to the metadata thread */
-		if (new_stream->metadata_flag) {
-			if (ctx->on_recv_stream) {
-				ret = ctx->on_recv_stream(new_stream);
-				if (ret < 0) {
-					goto end_nosignal;
-				}
+		/* Do actions once stream has been received. */
+		if (ctx->on_recv_stream) {
+			ret = ctx->on_recv_stream(new_stream);
+			if (ret < 0) {
+				consumer_del_stream(new_stream, NULL);
+				goto end_nosignal;
 			}
+		}
 
+		/* Send stream to the metadata thread */
+		if (new_stream->metadata_flag) {
 			do {
-				ret = write(ctx->consumer_metadata_pipe[1], new_stream,
-						sizeof(struct lttng_consumer_stream));
+				ret = write(ctx->consumer_metadata_pipe[1], &new_stream,
+						sizeof(new_stream));
 			} while (ret < 0 && errno == EINTR);
 			if (ret < 0) {
 				PERROR("write metadata pipe");
+				consumer_del_metadata_stream(new_stream, NULL);
+				goto end_nosignal;
 			}
 		} else {
-			if (ctx->on_recv_stream) {
-				ret = ctx->on_recv_stream(new_stream);
-				if (ret < 0) {
-					goto end_nosignal;
-				}
+			ret = consumer_add_stream(new_stream);
+			if (ret) {
+				ERR("Consumer add stream %d failed. Continuing",
+						new_stream->key);
+				/*
+				 * At this point, if the add_stream fails, it is not in the
+				 * hash table thus passing the NULL value here.
+				 */
+				consumer_del_stream(new_stream, NULL);
+				goto end_nosignal;
 			}
-			consumer_add_stream(new_stream);
 		}
 
 		DBG("UST consumer_add_stream %s (%d,%d) with relayd id %" PRIu64,
@@ -379,7 +387,7 @@ void lttng_ustconsumer_del_channel(struct lttng_consumer_channel *chan)
 	ustctl_unmap_channel(chan->handle);
 }
 
-int lttng_ustconsumer_allocate_stream(struct lttng_consumer_stream *stream)
+int lttng_ustconsumer_add_stream(struct lttng_consumer_stream *stream)
 {
 	struct lttng_ust_object_data obj;
 	int ret;
@@ -389,21 +397,35 @@ int lttng_ustconsumer_allocate_stream(struct lttng_consumer_stream *stream)
 	obj.wait_fd = stream->wait_fd;
 	obj.memory_map_size = stream->mmap_len;
 	ret = ustctl_add_stream(stream->chan->handle, &obj);
-	if (ret)
-		return ret;
+	if (ret) {
+		ERR("UST ctl add_stream failed with ret %d", ret);
+		goto error;
+	}
+
 	stream->buf = ustctl_open_stream_read(stream->chan->handle, stream->cpu);
-	if (!stream->buf)
-		return -EBUSY;
+	if (!stream->buf) {
+		ERR("UST ctl open_stream_read failed");
+		ret = -EBUSY;
+		goto error;
+	}
+
 	/* ustctl_open_stream_read has closed the shm fd. */
 	stream->wait_fd_is_copy = 1;
 	stream->shm_fd = -1;
 
 	stream->mmap_base = ustctl_get_mmap_base(stream->chan->handle, stream->buf);
 	if (!stream->mmap_base) {
-		return -EINVAL;
+		ERR("UST ctl get_mmap_base failed");
+		ret = -EINVAL;
+		goto mmap_error;
 	}
 
 	return 0;
+
+mmap_error:
+	ustctl_close_stream_read(stream->chan->handle, stream->buf);
+error:
+	return ret;
 }
 
 void lttng_ustconsumer_del_stream(struct lttng_consumer_stream *stream)
@@ -481,7 +503,6 @@ int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		ERR("Error writing to tracefile "
 				"(ret: %zd != len: %lu != subbuf_size: %lu)",
 				ret, len, subbuf_size);
-
 	}
 	err = ustctl_put_next_subbuf(handle, buf);
 	assert(err == 0);