X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=dfc4599be858315b3a2b25956b0daa49e9d24bd2;hb=094d1690f11fb6aeddac6acd71ba50a3c4e4e9b1;hp=d8c8017d83800511afa90e7223211a002e7d6481;hpb=36b588eddce05ef840bd247f6a58316925b9a0a2;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index d8c8017d8..dfc4599be 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -2183,6 +2183,7 @@ static int send_channel_uid_to_ust(struct buffer_reg_channel *reg_chan,
 
 		ret = ust_consumer_send_stream_to_ust(app, ua_chan, &stream);
 		if (ret < 0) {
+			(void) release_ust_app_stream(-1, &stream);
 			goto error_stream_unlock;
 		}
 
@@ -2403,7 +2404,7 @@ static int create_ust_app_channel(struct ust_app_session *ua_sess,
 	if (ua_chan == NULL) {
 		/* Only malloc can fail here */
 		ret = -ENOMEM;
-		goto error;
+		goto error_alloc;
 	}
 	shadow_copy_channel(ua_chan, uchan);
 
@@ -2431,6 +2432,7 @@ end:
 
 error:
 	delete_ust_app_channel(ua_chan->is_sent ? app->sock : -1, ua_chan, app);
+error_alloc:
 	return ret;
 }
 
@@ -2526,8 +2528,8 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess,
 		metadata->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
 		metadata->attr.subbuf_size = default_get_metadata_subbuf_size();
 		metadata->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
-		metadata->attr.switch_timer_interval = DEFAULT_UST_CHANNEL_SWITCH_TIMER;
-		metadata->attr.read_timer_interval = DEFAULT_UST_CHANNEL_READ_TIMER;
+		metadata->attr.switch_timer_interval = DEFAULT_METADATA_SWITCH_TIMER;
+		metadata->attr.read_timer_interval = DEFAULT_METADATA_READ_TIMER;
 		metadata->attr.output = LTTNG_UST_MMAP;
 		metadata->attr.type = LTTNG_UST_CHAN_METADATA;
 	} else {
@@ -2536,13 +2538,6 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess,
 		metadata->attr.type = LTTNG_UST_CHAN_METADATA;
 	}
 
-	/* Get the right consumer socket for the application. */
-	socket = consumer_find_socket_by_bitness(app->bits_per_long, consumer);
-	if (!socket) {
-		ret = -EINVAL;
-		goto error_consumer;
-	}
-
 	/* Need one fd for the channel. */
 	ret = lttng_fd_get(LTTNG_FD_APPS, 1);
 	if (ret < 0) {
@@ -2550,6 +2545,13 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess,
 		goto error;
 	}
 
+	/* Get the right consumer socket for the application. */
+	socket = consumer_find_socket_by_bitness(app->bits_per_long, consumer);
+	if (!socket) {
+		ret = -EINVAL;
+		goto error_consumer;
+	}
+
 	/*
 	 * Keep metadata key so we can identify it on the consumer side. Assign it
 	 * to the registry *before* we ask the consumer so we avoid the race of the
@@ -2571,7 +2573,6 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess,
 		 * Safe because the metadata obj pointer is not set so the delete below
 		 * will not put a FD back again.
 		 */
-		lttng_fd_put(LTTNG_FD_APPS, 1);
 		goto error_consumer;
 	}
 
@@ -2587,7 +2588,6 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess,
 		 * Safe because the metadata obj pointer is not set so the delete below
 		 * will not put a FD back again.
 		 */
-		lttng_fd_put(LTTNG_FD_APPS, 1);
 		goto error_consumer;
 	}
 
@@ -2595,6 +2595,7 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess,
 			metadata->key, app->pid);
 
 error_consumer:
+	lttng_fd_put(LTTNG_FD_APPS, 1);
 	delete_ust_app_channel(-1, metadata, app);
 error:
 	return ret;