From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Fri, 18 Sep 2015 19:35:21 +0000 (-0400)
Subject: Fix: Only log app handle release on failure
X-Git-Tag: v2.6.1~5
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=a347347e71de3c5dd2fcfce717e589797de9785c;p=lttng-tools.git

Fix: Only log app handle release on failure

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index d5208f58b..ae85bdb80 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -3382,7 +3382,9 @@ int ust_app_list_events(struct lttng_event **events)
 				}
 				free(tmp_event);
 				release_ret = ustctl_release_handle(app->sock, handle);
-				if (release_ret != -LTTNG_UST_ERR_EXITING && release_ret != -EPIPE) {
+				if (release_ret < 0 &&
+						release_ret != -LTTNG_UST_ERR_EXITING &&
+						release_ret != -EPIPE) {
 					ERR("Error releasing app handle for app %d with ret %d", app->sock, release_ret);
 				}
 				pthread_mutex_unlock(&app->sock_lock);
@@ -3407,7 +3409,9 @@ int ust_app_list_events(struct lttng_event **events)
 					free(tmp_event);
 					ret = -ENOMEM;
 					release_ret = ustctl_release_handle(app->sock, handle);
-					if (release_ret != -LTTNG_UST_ERR_EXITING && release_ret != -EPIPE) {
+					if (release_ret < 0 &&
+							release_ret != -LTTNG_UST_ERR_EXITING &&
+							release_ret != -EPIPE) {
 						ERR("Error releasing app handle for app %d with ret %d", app->sock, release_ret);
 					}
 					pthread_mutex_unlock(&app->sock_lock);
@@ -3428,7 +3432,7 @@ int ust_app_list_events(struct lttng_event **events)
 		}
 		ret = ustctl_release_handle(app->sock, handle);
 		pthread_mutex_unlock(&app->sock_lock);
-		if (ret != -LTTNG_UST_ERR_EXITING && ret != -EPIPE) {
+		if (ret < 0 && ret != -LTTNG_UST_ERR_EXITING && ret != -EPIPE) {
 			ERR("Error releasing app handle for app %d with ret %d", app->sock, ret);
 		}
 	}
@@ -3510,7 +3514,9 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 				free(tmp_event);
 				release_ret = ustctl_release_handle(app->sock, handle);
 				pthread_mutex_unlock(&app->sock_lock);
-				if (release_ret != -LTTNG_UST_ERR_EXITING && release_ret != -EPIPE) {
+				if (release_ret < 0 &&
+						release_ret != -LTTNG_UST_ERR_EXITING &&
+						release_ret != -EPIPE) {
 					ERR("Error releasing app handle for app %d with ret %d", app->sock, release_ret);
 				}
 				goto rcu_error;
@@ -3535,7 +3541,9 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 					ret = -ENOMEM;
 					release_ret = ustctl_release_handle(app->sock, handle);
 					pthread_mutex_unlock(&app->sock_lock);
-					if (release_ret != -LTTNG_UST_ERR_EXITING && release_ret != -EPIPE) {
+					if (release_ret &&
+							release_ret != -LTTNG_UST_ERR_EXITING &&
+							release_ret != -EPIPE) {
 						ERR("Error releasing app handle for app %d with ret %d", app->sock, release_ret);
 					}
 					goto rcu_error;
@@ -3561,7 +3569,9 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 		}
 		ret = ustctl_release_handle(app->sock, handle);
 		pthread_mutex_unlock(&app->sock_lock);
-		if (ret != -LTTNG_UST_ERR_EXITING && ret != -EPIPE) {
+		if (ret < 0 &&
+				ret != -LTTNG_UST_ERR_EXITING &&
+				ret != -EPIPE) {
 			ERR("Error releasing app handle for app %d with ret %d", app->sock, ret);
 		}
 	}