From 3e81c0f2fcfb479413c71a73e4de25bcdb6b198d Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Thu, 10 Sep 2015 16:10:57 -0400 Subject: [PATCH] Report error if any disable action fails MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- src/bin/lttng-sessiond/event.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c index 38cbe7925..13f09a51e 100644 --- a/src/bin/lttng-sessiond/event.c +++ b/src/bin/lttng-sessiond/event.c @@ -359,7 +359,7 @@ error: int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan) { - int ret, i, size; + int ret, i, size, error = 0; struct lttng_ht_iter iter; struct ltt_ust_event *uevent = NULL; struct lttng_event *events = NULL; @@ -376,6 +376,7 @@ int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, ret = event_ust_disable_tracepoint(usess, uchan, uevent->attr.name); if (ret < 0) { + error = LTTNG_ERR_UST_DISABLE_FAIL; continue; } } @@ -391,13 +392,14 @@ int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, for (i = 0; i < size; i++) { ret = event_ust_disable_tracepoint(usess, uchan, events[i].name); - if (ret != LTTNG_OK) { + if (ret < 0) { /* Continue to disable the rest... */ + error = LTTNG_ERR_UST_DISABLE_FAIL; continue; } } - ret = LTTNG_OK; + ret = error ? error : LTTNG_OK; error: rcu_read_unlock(); free(events); -- 2.34.1