X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=47cda24517da22ad53a899892562f660e71e8e32;hp=66b50eb43df98ea42c0700c5cedd5e9f28e17e8b;hb=205339471d9653a2b011d3eafe3a711cf79a6aca;hpb=affce97eaac76f77a3c83b1909d558b54e9a498f

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 66b50eb43..47cda2451 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -1100,7 +1100,7 @@ struct ust_app_event *alloc_ust_app_event(char *name,
 	/* Init most of the default value by allocating and zeroing */
 	ua_event = zmalloc(sizeof(struct ust_app_event));
 	if (ua_event == NULL) {
-		PERROR("malloc");
+		PERROR("Failed to allocate ust_app_event structure");
 		goto error;
 	}
 
@@ -3133,7 +3133,7 @@ int create_ust_app_event(struct ust_app_session *ua_sess,
 
 	ua_event = alloc_ust_app_event(uevent->attr.name, &uevent->attr);
 	if (ua_event == NULL) {
-		/* Only malloc can failed so something is really wrong */
+		/* Only failure mode of alloc_ust_app_event(). */
 		ret = -ENOMEM;
 		goto end;
 	}
@@ -3142,8 +3142,19 @@ int create_ust_app_event(struct ust_app_session *ua_sess,
 	/* Create it on the tracer side */
 	ret = create_ust_event(app, ua_sess, ua_chan, ua_event);
 	if (ret < 0) {
-		/* Not found previously means that it does not exist on the tracer */
-		assert(ret != -LTTNG_UST_ERR_EXIST);
+		/*
+		 * Not found previously means that it does not exist on the
+		 * tracer. If the application reports that the event existed,
+		 * it means there is a bug in the sessiond or lttng-ust
+		 * (or corruption, etc.)
+		 */
+		if (ret == -LTTNG_UST_ERR_EXIST) {
+			ERR("Tracer for application reported that an event being created already existed: "
+					"event_name = \"%s\", pid = %d, ppid = %d, uid = %d, gid = %d",
+					uevent->attr.name,
+					app->pid, app->ppid, app->uid,
+					app->gid);
+		}
 		goto error;
 	}
 
@@ -4413,7 +4424,7 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 	health_code_update();
 
 skip_setup:
-	/* This start the UST tracing */
+	/* This starts the UST tracing */
 	pthread_mutex_lock(&app->sock_lock);
 	ret = ustctl_start_session(app->sock, ua_sess->handle);
 	pthread_mutex_unlock(&app->sock_lock);