X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=3af7e394786c33c8a4eba27223165f148703ad20;hp=d8546308deb2cc2fa77e7c1b698627626b881234;hb=db786d4499cdc45cb071ab96c5b63c7d8b3206c1;hpb=533a90fb2d8d6892b86261951658cab6150a8ed6

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index d8546308d..3af7e3947 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -1011,7 +1011,7 @@ void delete_ust_app(struct ust_app *app)
 				app->event_notifier_group.event_pipe);
 
 		ret_code = notification_thread_command_remove_tracer_event_source(
-				notification_thread_handle,
+				the_notification_thread_handle,
 				event_notifier_read_fd);
 		if (ret_code != LTTNG_OK) {
 			ERR("Failed to remove application tracer event source from notification thread");
@@ -2954,7 +2954,7 @@ static int do_consumer_create_channel(struct ltt_ust_session *usess,
 	health_code_update();
 
 	/*
-	 * Now get the channel from the consumer. This call wil populate the stream
+	 * Now get the channel from the consumer. This call will populate the stream
 	 * list of that channel and set the ust objects.
 	 */
 	if (usess->consumer->enabled) {
@@ -3352,11 +3352,12 @@ static int create_channel_per_uid(struct ust_app *app,
 	pthread_mutex_unlock(&reg_uid->registry->reg.ust->lock);
 
 	notification_ret = notification_thread_command_add_channel(
-			notification_thread_handle, session->name,
-			lttng_credentials_get_uid(&ua_sess->effective_credentials),
-			lttng_credentials_get_gid(&ua_sess->effective_credentials),
-			ua_chan->name,
-			ua_chan->key, LTTNG_DOMAIN_UST,
+			the_notification_thread_handle, session->name,
+			lttng_credentials_get_uid(
+					&ua_sess->effective_credentials),
+			lttng_credentials_get_gid(
+					&ua_sess->effective_credentials),
+			ua_chan->name, ua_chan->key, LTTNG_DOMAIN_UST,
 			ua_chan->attr.subbuf_size * ua_chan->attr.num_subbuf);
 	if (notification_ret != LTTNG_OK) {
 		ret = - (int) notification_ret;
@@ -3453,11 +3454,12 @@ static int create_channel_per_pid(struct ust_app *app,
 	pthread_mutex_unlock(&registry->lock);
 
 	cmd_ret = notification_thread_command_add_channel(
-			notification_thread_handle, session->name,
-			lttng_credentials_get_uid(&ua_sess->effective_credentials),
-			lttng_credentials_get_gid(&ua_sess->effective_credentials),
-			ua_chan->name,
-			ua_chan->key, LTTNG_DOMAIN_UST,
+			the_notification_thread_handle, session->name,
+			lttng_credentials_get_uid(
+					&ua_sess->effective_credentials),
+			lttng_credentials_get_gid(
+					&ua_sess->effective_credentials),
+			ua_chan->name, ua_chan->key, LTTNG_DOMAIN_UST,
 			ua_chan->attr.subbuf_size * ua_chan->attr.num_subbuf);
 	if (cmd_ret != LTTNG_OK) {
 		ret = - (int) cmd_ret;
@@ -3850,9 +3852,11 @@ struct ust_app *ust_app_create(struct ust_register_msg *msg, int sock)
 	DBG3("UST app creating application for socket %d", sock);
 
 	if ((msg->bits_per_long == 64 &&
-				(uatomic_read(&ust_consumerd64_fd) == -EINVAL))
-			|| (msg->bits_per_long == 32 &&
-				(uatomic_read(&ust_consumerd32_fd) == -EINVAL))) {
+			    (uatomic_read(&the_ust_consumerd64_fd) ==
+					    -EINVAL)) ||
+			(msg->bits_per_long == 32 &&
+					(uatomic_read(&the_ust_consumerd32_fd) ==
+							-EINVAL))) {
 		ERR("Registration failed: application \"%s\" (pid: %d) has "
 				"%d-bit long, but no consumerd for this size is available.\n",
 				msg->name, msg->pid, msg->bits_per_long);
@@ -4046,8 +4050,9 @@ int ust_app_setup_event_notifier_group(struct ust_app *app)
 	lttng_fd_put(LTTNG_FD_APPS, 1);
 
 	lttng_ret = notification_thread_command_add_tracer_event_source(
-			notification_thread_handle,
-			lttng_pipe_get_readfd(app->event_notifier_group.event_pipe),
+			the_notification_thread_handle,
+			lttng_pipe_get_readfd(
+					app->event_notifier_group.event_pipe),
 			LTTNG_DOMAIN_UST);
 	if (lttng_ret != LTTNG_OK) {
 		ERR("Failed to add tracer event source to notification thread");
@@ -4070,6 +4075,7 @@ int ust_app_setup_event_notifier_group(struct ust_app *app)
 error:
 	ustctl_release_object(app->sock, app->event_notifier_group.object);
 	free(app->event_notifier_group.object);
+	app->event_notifier_group.object = NULL;
 	return ret;
 }
 
@@ -5645,7 +5651,7 @@ void ust_app_synchronize_event_notifier_rules(struct ust_app *app)
 
 	/* Get all triggers using uid 0 (root) */
 	ret_code = notification_thread_command_list_triggers(
-			notification_thread_handle, 0, &triggers);
+			the_notification_thread_handle, 0, &triggers);
 	if (ret_code != LTTNG_OK) {
 		ret = -1;
 		goto end;
@@ -7112,11 +7118,6 @@ enum lttng_error_code ust_app_rotate_session(struct ltt_session *session)
 			struct buffer_reg_channel *buf_reg_chan;
 			struct consumer_socket *socket;
 
-			if (!reg->registry->reg.ust->metadata_key) {
-				/* Skip since no metadata is present */
-				continue;
-			}
-
 			/* Get consumer socket to use to push the metadata.*/
 			socket = consumer_find_socket_by_bitness(reg->bits_per_long,
 					usess->consumer);
@@ -7139,6 +7140,19 @@ enum lttng_error_code ust_app_rotate_session(struct ltt_session *session)
 				}
 			}
 
+			/*
+			 * The metadata channel might not be present.
+			 *
+			 * Consumer stream allocation can be done
+			 * asynchronously and can fail on intermediary
+			 * operations (i.e add context) and lead to data
+			 * channels created with no metadata channel.
+			 */
+			if (!reg->registry->reg.ust->metadata_key) {
+				/* Skip since no metadata is present. */
+				continue;
+			}
+
 			(void) push_metadata(reg->registry->reg.ust, usess->consumer);
 
 			ret = consumer_rotate_channel(socket,