===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tcpbench/tcpbench.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- src/usr.bin/tcpbench/tcpbench.c	2012/01/31 16:15:46	1.32
+++ src/usr.bin/tcpbench/tcpbench.c	2012/04/07 21:52:03	1.33
@@ -75,6 +75,12 @@
 	size_t	  dummybuf_len;	/* IO buffer len */
 } tcpbench, *ptb;
 
+struct tcpservsock {
+	struct event ev;
+	struct event evt;
+	int fd;
+};
+
 /* stats for a single tcp connection, udp uses only one  */
 struct statctx {
 	TAILQ_ENTRY(statctx) entry;
@@ -85,6 +91,7 @@
 	size_t buflen;
 	struct event ev;
 	/* TCP only */
+	struct tcpservsock *tcp_ts;
 	u_long tcp_tcbaddr;
 	/* UDP only */
 	u_long udp_slice_pkts;
@@ -644,9 +651,18 @@
 	} else if (n == 0) {
 		if (ptb->vflag)
 			fprintf(stderr, "%8d closed by remote end\n", sc->fd);
+
+		TAILQ_REMOVE(&sc_queue, sc, entry);
+
 		event_del(&sc->ev);
 		close(sc->fd);
-		TAILQ_REMOVE(&sc_queue, sc, entry);
+
+		/* Some file descriptors are available again. */
+		if (evtimer_pending(&sc->tcp_ts->evt, NULL)) {
+			evtimer_del(&sc->tcp_ts->evt);
+			event_add(&sc->tcp_ts->ev, NULL);
+		}
+
 		free(sc);
 		mainstats.nconns--;
 		set_slice_timer(mainstats.nconns > 0);
@@ -659,8 +675,9 @@
 }
 	
 static void
-tcp_server_accept(int fd, short event, void *bula)
+tcp_server_accept(int fd, short event, void *arg)
 {
+	struct tcpservsock *ts = arg;
 	int sock, r;
 	struct statctx *sc;
 	struct sockaddr_storage ss;
@@ -668,11 +685,25 @@
 	char tmp[128];
 	
 	sslen = sizeof(ss);
+
+	event_add(&ts->ev, NULL);
+	if (event & EV_TIMEOUT)
+		return;
 again:	
 	if ((sock = accept(fd, (struct sockaddr *)&ss, &sslen)) == -1) {
 		if (errno == EINTR)
 			goto again;
-		warn("accept");
+		/*
+		 * Pause accept if we are out of file descriptors, or
+		 * libevent will haunt us here too.
+		 */
+		if (errno == ENFILE || errno == EMFILE) {
+			struct timeval evtpause = { 1, 0 };
+
+			event_del(&ts->ev);
+			evtimer_add(&ts->evt, &evtpause);
+		} else
+			warn("accept");
 		return;
 	}
 	saddr_ntop((struct sockaddr *)&ss, sslen,
@@ -695,6 +726,7 @@
 	/* Alloc client structure and register reading callback */
 	if ((sc = calloc(1, sizeof(*sc))) == NULL)
 		err(1, "calloc");
+	sc->tcp_ts = ts;
 	sc->fd = sock;
 	stats_prepare(sc);
 	event_set(&sc->ev, sc->fd, EV_READ | EV_PERSIST,
@@ -715,6 +747,7 @@
 	int sock, on = 1;
 	struct addrinfo *ai;
 	struct event *ev;
+	struct tcpservsock *ts;
 	nfds_t lnfds;
 
 	lnfds = 0;
@@ -775,15 +808,22 @@
 				continue;
 			}
 		}
-		if ((ev = calloc(1, sizeof(*ev))) == NULL)
-			err(1, "calloc");
-		if (UDP_MODE)
+		if (UDP_MODE) {
+			if ((ev = calloc(1, sizeof(*ev))) == NULL)
+				err(1, "calloc");
 			event_set(ev, sock, EV_READ | EV_PERSIST,
 			    udp_server_handle_sc, udp_sc);
-		else
-			event_set(ev, sock, EV_READ | EV_PERSIST,
-			    tcp_server_accept, NULL);
-		event_add(ev, NULL);
+			event_add(ev, NULL);
+		} else {
+			if ((ts = calloc(1, sizeof(*ts))) == NULL)
+				err(1, "calloc");
+
+			ts->fd = sock;
+			evtimer_set(&ts->evt, tcp_server_accept, ts);
+			event_set(&ts->ev, ts->fd, EV_READ,
+			    tcp_server_accept, ts);
+			event_add(&ts->ev, NULL);
+		}
 		if (ptb->vflag >= 3)
 			fprintf(stderr, "bound to fd %d\n", sock);
 		lnfds++;