From: Geneviève Bastien <gbastien@versatic.net>
Date: Mon, 17 Jun 2019 16:56:21 +0000 (-0400)
Subject: Fix: error when listing sessions with no session
X-Git-Tag: v2.11.0-rc3~155
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=27ea4ba825;p=lttng-tools.git

Fix: error when listing sessions with no session

lttng_list_sessions() returns a "fatal error" code when
lttng_ctl_ask_sessiond() returns 0. This was interpreted as the
control socket being shutdown unexpectedly. However, it is
(more often) caused by no sessions being available. Given that, it
makes more sense to report that no sessions are available.

More clean-up/refactoring would be needed to report unexpected socket
shutdowns.

Fixes #1188

Signed-off-by: Geneviève Bastien <gbastien@versatic.net>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index f50ca3061..20dca8132 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -2077,7 +2077,6 @@ int lttng_list_sessions(struct lttng_session **out_sessions)
 	lsm.cmd_type = LTTNG_LIST_SESSIONS;
 	ret = lttng_ctl_ask_sessiond(&lsm, (void**) &sessions);
 	if (ret <= 0) {
-		ret = ret == 0 ? -LTTNG_ERR_FATAL : ret;
 		goto end;
 	}
 	if (!sessions) {