X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=03c00a677ac4f53702dd79c68cc2759b897bdd4f;hb=f96e4545bd7a4dd9c58eb7e8a42eafe0b18089ad;hp=0edb513f89c15263b2244983dcbf22626f95c734;hpb=8fd623e0d1c389a76e4dc3ee74a77490b678c5b8;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 0edb513f8..03c00a677 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -883,6 +883,12 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		case LTTNG_UST_CHAN_PER_CPU:
 			channel->type = CONSUMER_CHANNEL_TYPE_DATA;
 			attr.type = LTTNG_UST_CHAN_PER_CPU;
+			/*
+			 * Set refcount to 1 for owner. Below, we will
+			 * pass ownership to the
+			 * consumer_thread_channel_poll() thread.
+			 */
+			channel->refcount = 1;
 			break;
 		case LTTNG_UST_CHAN_METADATA:
 			channel->type = CONSUMER_CHANNEL_TYPE_METADATA;
@@ -898,10 +904,22 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			goto end_channel_error;
 		}
 
+		if (msg.u.ask_channel.type == LTTNG_UST_CHAN_METADATA) {
+			ret = consumer_metadata_cache_allocate(channel);
+			if (ret < 0) {
+				ERR("Allocating metadata cache");
+				goto end_channel_error;
+			}
+			consumer_timer_switch_start(channel, attr.switch_timer_interval);
+			attr.switch_timer_interval = 0;
+		}
+
 		/*
 		 * Add the channel to the internal state AFTER all streams were created
 		 * and successfully sent to session daemon. This way, all streams must
 		 * be ready before this channel is visible to the threads.
+		 * If add_channel succeeds, ownership of the channel is
+		 * passed to consumer_thread_channel_poll().
 		 */
 		ret = add_channel(channel, ctx);
 		if (ret < 0) {
@@ -923,16 +941,6 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			goto end_nosignal;
 		}
 
-		if (msg.u.ask_channel.type == LTTNG_UST_CHAN_METADATA) {
-			ret = consumer_metadata_cache_allocate(channel);
-			if (ret < 0) {
-				ERR("Allocating metadata cache");
-				goto end_channel_error;
-			}
-			consumer_timer_switch_start(channel, attr.switch_timer_interval);
-			attr.switch_timer_interval = 0;
-		}
-
 		break;
 	}
 	case LTTNG_CONSUMER_GET_CHANNEL:
@@ -1040,6 +1048,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		if (!channel) {
 			ERR("UST consumer push metadata %" PRIu64 " not found", key);
 			ret_code = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+			goto end_msg_sessiond;
 		}
 
 		/* Tell session daemon we are ready to receive the metadata. */