X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=acceptor.cpp;h=d4d4efb29d668a252b3427ab347e7fa2197f2566;hp=3172c73b80a1821e0973e08c267f6f8ccae74c10;hb=bfc1a54cf84bb1784c14bd4f5acbb500460e35b5;hpb=5cd46e39b4063d94f6dc559ae350beeb8406a8f9

diff --git a/acceptor.cpp b/acceptor.cpp
index 3172c73..d4d4efb 100644
--- a/acceptor.cpp
+++ b/acceptor.cpp
@@ -1,6 +1,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <poll.h>
 #include <stdlib.h>
 #include <string.h>
@@ -12,11 +13,11 @@
 #include "log.h"
 #include "serverpool.h"
 #include "state.pb.h"
+#include "util.h"
 
 using namespace std;
 
 extern ServerPool *servers;
-extern volatile bool hupped;
 
 int create_server_socket(int port, SocketType socket_type)
 {
@@ -93,32 +94,13 @@ AcceptorProto Acceptor::serialize() const
 
 void Acceptor::close_socket()
 {
-	int ret;
-	do {
-		ret = close(server_sock);
-	} while (ret == -1 && errno == EINTR);
-
-	if (ret == -1) {
-		log_perror("close");
-	}
+	safe_close(server_sock);
 }
 
 void Acceptor::do_work()
 {
-	while (!hupped) {
-		// Since we are non-blocking, we need to wait for the right state first.
-		// Wait up to 50 ms, then check hupped.
-		pollfd pfd;
-		pfd.fd = server_sock;
-		pfd.events = POLLIN;
-
-		int nfds = poll(&pfd, 1, 50);
-		if (nfds == 0 || (nfds == -1 && errno == EINTR)) {
-			continue;
-		}
-		if (nfds == -1) {
-			log_perror("poll");
-			usleep(100000);
+	while (!should_stop()) {
+		if (!wait_for_activity(server_sock, POLLIN, NULL)) {
 			continue;
 		}
 
@@ -139,10 +121,18 @@ void Acceptor::do_work()
 		// Set the socket as nonblocking.
 		int one = 1;
 		if (ioctl(sock, FIONBIO, &one) == -1) {
-			log_perror("FIONBIO");
+			log_perror("ioctl(FIONBIO)");
 			exit(1);
 		}
 
+		// Enable TCP_CORK for maximum throughput. In the rare case that the
+		// stream stops entirely, this will cause a small delay (~200 ms)
+		// before the last part is sent out, but that should be fine.
+		if (setsockopt(sock, SOL_TCP, TCP_CORK, &one, sizeof(one)) == -1) {
+			log_perror("setsockopt(TCP_CORK)");
+			// Can still continue.
+		}
+
 		// Pick a server, round-robin, and hand over the socket to it.
 		servers->add_client(sock);
 	}