X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=9cb3590167ed761f5dd04f71edd04103da7461b3;hp=2cb6ad68ab814b63bc77c2792c17e5a05c147a0f;hb=adc93634b7c0f153a620dd559a91edbf7346bceb;hpb=c0a66c84b5b2484b75798aec7543b680b4d4ab6c

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 2cb6ad68a..9cb359016 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -2564,8 +2564,7 @@ int client_flush_outgoing_queue(struct notification_client *client,
 	ret = lttcomm_send_unix_sock_non_block(client->socket,
 			client->communication.outbound.buffer.data,
 			to_send_count);
-	if ((ret < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) ||
-			(ret > 0 && ret < to_send_count)) {
+	if ((ret >= 0 && ret < to_send_count)) {
 		DBG("[notification-thread] Client (socket fd = %i) outgoing queue could not be completely flushed",
 				client->socket);
 		to_send_count -= max(ret, 0);
@@ -3089,8 +3088,7 @@ end:
 }
 
 static
-int client_enqueue_dropped_notification(struct notification_client *client,
-		struct notification_thread_state *state)
+int client_enqueue_dropped_notification(struct notification_client *client)
 {
 	int ret;
 	struct lttng_notification_channel_message msg = {
@@ -3168,7 +3166,7 @@ int send_evaluation_to_clients(const struct lttng_trigger *trigger,
 			if (!client->communication.outbound.dropped_notification) {
 				client->communication.outbound.dropped_notification = true;
 				ret = client_enqueue_dropped_notification(
-						client, state);
+						client);
 				if (ret) {
 					goto end;
 				}