From: David Goulet <dgoulet@efficios.com>
Date: Mon, 21 Jan 2013 15:50:44 +0000 (-0500)
Subject: Fix: improve error handling for UST stream creation
X-Git-Tag: v2.2.0-rc1~107
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5548a3813aac21320fd4cd415bb47a293e1dc6e0;p=lttng-tools.git

Fix: improve error handling for UST stream creation

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 7da843a9e..035fe7f67 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -2320,11 +2320,16 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 			ret = ustctl_create_stream(app->sock, ua_chan->obj,
 					&ustream->obj);
 			if (ret < 0) {
-				/* Got all streams */
-				lttng_fd_put(LTTNG_FD_APPS, 2);
+				/* Free unused memory and reset FD states. */
 				free(ustream);
+				lttng_fd_put(LTTNG_FD_APPS, 2);
+				if (ret == -ENOENT) {
+					/* Got all streams. Continue normal execution. */
+					break;
+				}
+				/* Error at this point. Stop everything. */
 				ret = LTTNG_ERR_UST_STREAM_FAIL;
-				break;
+				goto error_rcu_unlock;
 			}
 			ustream->handle = ustream->obj->handle;