From 5d2f36a0c48e0ab3c294070787d28098e93d273e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Vavru=C5=A1a?= <marek.vavrusa@nic.cz>
Date: Thu, 5 Feb 2015 15:14:21 +0100
Subject: [PATCH] tcp: make sure master sockets are not closed, cooperative
throttling
---
src/knot/server/tcp-handler.c | 39 ++++++++++++++++-------------------
1 file changed, 18 insertions(+), 21 deletions(-)
diff --git a/src/knot/server/tcp-handler.c b/src/knot/server/tcp-handler.c
index 70099c773..3b9018040 100644
--- a/src/knot/server/tcp-handler.c
+++ b/src/knot/server/tcp-handler.c
@@ -352,37 +352,34 @@ static int tcp_wait_for_events(tcp_context_t *tcp)
/* Process events. */
unsigned i = 0;
while (nfds > 0 && i < set->n) {
-
- /* Terminate faulty connections. */
+ bool should_close = false;
int fd = set->pfd[i].fd;
-
- /* Active sockets. */
- if (set->pfd[i].revents & POLLIN) {
- --nfds; /* One less active event. */
-
- /* Indexes <0, client_threshold) are master sockets. */
+ if (set->pfd[i].revents & (POLLERR|POLLHUP|POLLNVAL)) {
+ should_close = (i >= tcp->client_threshold);
+ --nfds;
+ } else if (set->pfd[i].revents & (POLLIN)) {
+ /* Master sockets */
if (i < tcp->client_threshold) {
- /* Faulty master sockets shall be sorted later. */
- (void) tcp_event_accept(tcp, i);
+ if (!is_throttled && tcp_event_accept(tcp, i) == KNOT_EBUSY) {
+ time_now(&tcp->throttle_end);
+ tcp->throttle_end.tv_sec += tcp_throttle();
+ }
+ /* Client sockets */
} else {
if (tcp_event_serve(tcp, i) != KNOT_EOK) {
- fdset_remove(set, i);
- close(fd);
- continue; /* Stay on the same index. */
+ should_close = true;
}
}
-
+ --nfds;
}
-
- if (set->pfd[i].revents & (POLLERR|POLLHUP|POLLNVAL)) {
- --nfds; /* One less active event. */
+
+ /* Evaluate */
+ if (should_close) {
fdset_remove(set, i);
close(fd);
- continue; /* Stay on the same index. */
+ } else {
+ ++i;
}
-
- /* Next socket. */
- ++i;
}
return nfds;
--
GitLab