X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=f7dd90cbe0aec976925dd0215af89d8b81648b10;hb=e742b055bd4e2a21e86b16dcf82ac0805dcfb347;hp=2cb6ad68ab814b63bc77c2792c17e5a05c147a0f;hpb=c0a66c84b5b2484b75798aec7543b680b4d4ab6c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 2cb6ad68a..f7dd90cbe 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -491,7 +491,7 @@ enum lttng_object_type get_condition_binding_object(
 	case LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW:
 	case LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH:
 	case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE:
-	        return LTTNG_OBJECT_TYPE_CHANNEL;
+		return LTTNG_OBJECT_TYPE_CHANNEL;
 	case LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING:
 	case LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED:
 		return LTTNG_OBJECT_TYPE_SESSION;
@@ -682,7 +682,7 @@ struct notification_client_list *get_client_list_from_condition(
 			&iter);
 	node = cds_lfht_iter_get_node(&iter);
 
-        return node ? caa_container_of(node,
+	return node ? caa_container_of(node,
 			struct notification_client_list,
 			notification_trigger_ht_node) : NULL;
 }
@@ -1306,7 +1306,7 @@ struct lttng_session_trigger_list *get_session_trigger_list(
 		goto end;
 	}
 
-        list = caa_container_of(node,
+	list = caa_container_of(node,
 			struct lttng_session_trigger_list,
 			session_triggers_ht_node);
 end:
@@ -2426,7 +2426,7 @@ int handle_notification_thread_client_connect(
 	ret = client_reset_inbound_state(client);
 	if (ret) {
 		ERR("[notification-thread] Failed to reset client communication's inbound state");
-	        ret = 0;
+		ret = 0;
 		goto error;
 	}
 
@@ -2498,7 +2498,7 @@ int handle_notification_thread_client_disconnect(
 	if (ret) {
 		ERR("[notification-thread] Failed to remove client socket from poll set");
 	}
-        cds_lfht_del(state->client_socket_ht,
+	cds_lfht_del(state->client_socket_ht,
 			&client->client_socket_ht_node);
 	notification_client_destroy(client, state);
 end:
@@ -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;
 				}
@@ -3329,7 +3327,7 @@ int handle_notification_thread_channel_sample(
 	trigger_list = caa_container_of(node, struct lttng_channel_trigger_list,
 			channel_triggers_ht_node);
 	cds_list_for_each_entry(trigger_list_element, &trigger_list->list,
-		        node) {
+			node) {
 		const struct lttng_condition *condition;
 		const struct lttng_action *action;
 		const struct lttng_trigger *trigger;