Commit Diff


commit - cd1f027e43542f5d4e12c7eccf394fc605afa77ae19647971dac32900f0ee7c3
commit + 0c015ab4872bcbdfc2e941da7bb6ca6bb32ce98865d971a29416a1e881372bf0
blob - afec4a164cf1193b4b8f713e605573f3529346e9e70f60d8ff0ed6f84282ef46
blob + d75843b991deeebb6107fc3cfa866d6663fa1807ca6939c417a9c56985ece217
--- gotwebd/gotwebd.h	
+++ gotwebd/gotwebd.h	
@@ -94,7 +94,6 @@
     (((n) + (FCGI_ALIGNMENT - 1)) & ~(FCGI_ALIGNMENT - 1))
 
 #define FD_RESERVE		 5
-#define FD_NEEDED		 6
 
 #define FCGI_BEGIN_REQUEST	 1
 #define FCGI_ABORT_REQUEST	 2
blob - 804bf2fd7ba453feb5c495ea1ff26ee339267ecef4bae660cf07b3f828490fb8
blob + e018e21f727f6f3e220117ac13f4f9507b95b449a7a7b895be4e15c8eacebc74
--- gotwebd/sockets.c	
+++ gotwebd/sockets.c	
@@ -69,7 +69,6 @@ static struct timeval	timeout = { TIMEOUT_DEFAULT, 0 }
 static void	 sockets_sighdlr(int, short, void *);
 static void	 sockets_shutdown(void);
 static void	 sockets_launch(struct gotwebd *);
-static void	 sockets_accept_paused(int, short, void *);
 
 static void	 sockets_dispatch_main(int, short, void *);
 static int	 sockets_unix_socket_listen(struct gotwebd *, struct socket *, uid_t, gid_t);
@@ -359,7 +358,7 @@ sockets_launch(struct gotwebd *env)
 		if (event_add(&sock->ev, NULL))
 			fatalx("event add sock");
 
-		evtimer_set(&sock->pause, sockets_accept_paused, sock);
+		evtimer_set(&sock->pause, sockets_socket_accept, sock);
 
 		log_info("%s: running socket listener %d", __func__,
 		    sock->conf.id);
@@ -986,8 +985,7 @@ sockets_accept_reserve(int sockfd, struct sockaddr *ad
 {
 	int ret;
 
-	if (getdtablecount() + reserve +
-	    ((*counter + 1) * FD_NEEDED) >= getdtablesize()) {
+	if (getdtablecount() + reserve + *counter + 1 >= getdtablesize()) {
 		log_warnx("inflight fds exceeded");
 		errno = EMFILE;
 		return -1;
@@ -1002,14 +1000,6 @@ sockets_accept_reserve(int sockfd, struct sockaddr *ad
 	return ret;
 }
 
-static void
-sockets_accept_paused(int fd, short events, void *arg)
-{
-	struct socket *sock = (struct socket *)arg;
-
-	event_add(&sock->ev, NULL);
-}
-
 static int
 parse_params(struct request *c, uint8_t *record, size_t record_len)
 {
@@ -1196,8 +1186,7 @@ sockets_socket_accept(int fd, short event, void *arg)
 		case ENFILE:
 			log_warn("accept");
 			event_del(&sock->ev);
-			if (!evtimer_pending(&sock->pause, NULL))
-				evtimer_add(&sock->pause, &backoff);
+			evtimer_add(&sock->pause, &backoff);
 			return;
 		default:
 			log_warn("%s: accept", __func__);