X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=ab08ac0e4d04ccf409c8d02e358e11f0033a0520;hb=a2ba1ab0fbd794f06d5ba9afac6b3749dace34e4;hp=d8adccde214925f2f9cd68d20ef65dadc3617951;hpb=7cc9a73c638bff0a86d7ea802ebd7fa3b4716ca9;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index d8adccde2..ab08ac0e4 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -406,7 +406,8 @@ void delete_ust_app_channel(int sock, struct ust_app_channel *ua_chan,
 	if (ua_chan->obj != NULL) {
 		/* Remove channel from application UST object descriptor. */
 		iter.iter.node = &ua_chan->ust_objd_node.node;
-		lttng_ht_del(app->ust_objd, &iter);
+		ret = lttng_ht_del(app->ust_objd, &iter);
+		assert(!ret);
 		ret = ustctl_release_object(sock, ua_chan->obj);
 		if (ret < 0 && ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
 			ERR("UST app sock %d release channel obj failed with ret %d",
@@ -481,6 +482,25 @@ push_data:
 	ret = consumer_push_metadata(socket, registry->metadata_key,
 			metadata_str, len, offset);
 	if (ret < 0) {
+		/*
+		 * There is an acceptable race here between the registry metadata key
+		 * assignment and the creation on the consumer. The session daemon can
+		 * concurrently push metadata for this registry while being created on
+		 * the consumer since the metadata key of the registry is assigned
+		 * *before* it is setup to avoid the consumer to ask for metadata that
+		 * could possibly be not found in the session daemon.
+		 *
+		 * The metadata will get pushed either by the session being stopped or
+		 * the consumer requesting metadata if that race is triggered.
+		 */
+		if (ret == -LTTCOMM_CONSUMERD_CHANNEL_FAIL) {
+			ret = 0;
+		}
+
+		/* Update back the actual metadata len sent since it failed here. */
+		pthread_mutex_lock(&registry->lock);
+		registry->metadata_len_sent -= len;
+		pthread_mutex_unlock(&registry->lock);
 		ret_val = ret;
 		goto error_push;
 	}
@@ -1480,8 +1500,11 @@ static void shadow_copy_event(struct ust_app_event *ua_event,
 		exclusion_alloc_size = sizeof(struct lttng_ust_event_exclusion) +
 				LTTNG_UST_SYM_NAME_LEN * uevent->exclusion->count;
 		ua_event->exclusion = zmalloc(exclusion_alloc_size);
-		if (ua_event->exclusion) {
-			memcpy(ua_event->exclusion, uevent->exclusion, exclusion_alloc_size);
+		if (ua_event->exclusion == NULL) {
+			PERROR("malloc");
+		} else {
+			memcpy(ua_event->exclusion, uevent->exclusion,
+					exclusion_alloc_size);
 		}
 	}
 }
@@ -3125,7 +3148,7 @@ int ust_app_list_events(struct lttng_event **events)
 			/* Handle ustctl error. */
 			if (ret < 0) {
 				free(tmp_event);
-				if (ret != -LTTNG_UST_ERR_EXITING || ret != -EPIPE) {
+				if (ret != -LTTNG_UST_ERR_EXITING && ret != -EPIPE) {
 					ERR("UST app tp list get failed for app %d with ret %d",
 							app->sock, ret);
 				} else {
@@ -3225,7 +3248,7 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 			/* Handle ustctl error. */
 			if (ret < 0) {
 				free(tmp_event);
-				if (ret != -LTTNG_UST_ERR_EXITING || ret != -EPIPE) {
+				if (ret != -LTTNG_UST_ERR_EXITING && ret != -EPIPE) {
 					ERR("UST app tp list field failed for app %d with ret %d",
 							app->sock, ret);
 				} else {
@@ -3259,12 +3282,13 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 			}
 
 			memcpy(tmp_event[count].field_name, uiter.field_name, LTTNG_UST_SYM_NAME_LEN);
-			tmp_event[count].type = uiter.type;
+			/* Mapping between these enums matches 1 to 1. */
+			tmp_event[count].type = (enum lttng_event_field_type) uiter.type;
 			tmp_event[count].nowrite = uiter.nowrite;
 
 			memcpy(tmp_event[count].event.name, uiter.event_name, LTTNG_UST_SYM_NAME_LEN);
 			tmp_event[count].event.loglevel = uiter.loglevel;
-			tmp_event[count].event.type = LTTNG_UST_TRACEPOINT;
+			tmp_event[count].event.type = LTTNG_EVENT_TRACEPOINT;
 			tmp_event[count].event.pid = app->pid;
 			tmp_event[count].event.enabled = -1;
 			count++;