X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=41f201c48bb4ef8ea31b8c318c1ae95f2c4b434a;hb=14a5bf2843c2bdc13c3a4ec3335a13c867ba3619;hp=205fdad16684da05e2beb427992d5b5402b1e37a;hpb=8366341d04bcb37d169861a74c7cb093beb2572a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 205fdad16..41f201c48 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -45,6 +45,10 @@
 #include "notification-thread-commands.h"
 #include "rotate.h"
 
+struct lttng_ht *ust_app_ht;
+struct lttng_ht *ust_app_ht_by_sock;
+struct lttng_ht *ust_app_ht_by_notify_sock;
+
 static
 int ust_app_flush_app_session(struct ust_app *app, struct ust_app_session *ua_sess);
 
@@ -4118,11 +4122,14 @@ int ust_app_channel_create(struct ltt_ust_session *usess,
 		ret = ust_app_channel_allocate(ua_sess, uchan,
 			LTTNG_UST_CHAN_PER_CPU, usess,
 			&ua_chan);
-		if (ret == 0) {
-			ret = ust_app_channel_send(app, usess,
-				ua_sess, ua_chan);
-		} else {
-			goto end;
+		if (ret < 0) {
+			goto error;
+		}
+
+		ret = ust_app_channel_send(app, usess,
+			ua_sess, ua_chan);
+		if (ret) {
+			goto error;
 		}
 
 		/* Add contexts. */
@@ -4130,10 +4137,12 @@ int ust_app_channel_create(struct ltt_ust_session *usess,
 			ret = create_ust_app_channel_context(ua_chan,
 				&uctx->ctx, app);
 			if (ret) {
-				goto end;
+				goto error;
 			}
 		}
 	}
+
+error:
 	if (ret < 0) {
 		switch (ret) {
 		case -ENOTCONN:
@@ -4149,7 +4158,7 @@ int ust_app_channel_create(struct ltt_ust_session *usess,
 			break;
 		}
 	}
-end:
+
 	if (ret == 0 && _ua_chan) {
 		/*
 		 * Only return the application's channel on success. Note