From ef4cf9957b668845eb1064f583a0021009cbeeac Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 13 Jun 2015 22:40:40 +0200 Subject: [PATCH] Use accept4() to save a system call. Probably inconsequential, but still nice. --- acceptor.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/acceptor.cpp b/acceptor.cpp index 593e4d4..7c28ca5 100644 --- a/acceptor.cpp +++ b/acceptor.cpp @@ -130,8 +130,8 @@ void Acceptor::do_work() sockaddr_in6 addr; socklen_t addrlen = sizeof(addr); - // Get a new socket. - int sock = accept(server_sock, reinterpret_cast(&addr), &addrlen); + // Get a new socket, and set it as nonblocking. + int sock = accept4(server_sock, reinterpret_cast(&addr), &addrlen, SOCK_NONBLOCK); if (sock == -1 && errno == EINTR) { continue; } @@ -141,16 +141,10 @@ void Acceptor::do_work() continue; } - // Set the socket as nonblocking. - int one = 1; - if (ioctl(sock, FIONBIO, &one) == -1) { - 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. + int one = 1; if (setsockopt(sock, SOL_TCP, TCP_CORK, &one, sizeof(one)) == -1) { log_perror("setsockopt(TCP_CORK)"); // Can still continue. -- 2.39.2