Drop NO_LEVEL; it does not look very pretty now.

[cubemap] / acceptor.cpp

diff --git a/acceptor.cpp b/acceptor.cpp
index 776f39b6c3f54e7e2ad0377aeb7d28c27bfb0d74..70cd30c23bdfdcd53c16efe025c2ce4e58b01bdd 100644 (file)
--- a/acceptor.cpp
+++ b/acceptor.cpp
@@ -1,45 +1,54 @@
+#include <assert.h>
+#include <errno.h>
+#include <netinet/in.h>
+#include <poll.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <string.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <signal.h>
-#include <errno.h>
-#include <arpa/inet.h>
+#include <string.h>

 #include <sys/ioctl.h>
 #include <sys/ioctl.h>

-#include <sys/poll.h>

 #include <sys/socket.h>
 #include <sys/socket.h>

+#include <unistd.h>

 
 #include "acceptor.h"
 
 #include "acceptor.h"

+#include "log.h"

 #include "serverpool.h"
 #include "serverpool.h"

+#include "state.pb.h"

 
 using namespace std;
 
 extern ServerPool *servers;
 extern volatile bool hupped;
 
 
 using namespace std;
 
 extern ServerPool *servers;
 extern volatile bool hupped;
 

-int create_server_socket(int port)
+int create_server_socket(int port, SocketType socket_type)

 {
 {

-       int server_sock = socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP);
+       int server_sock;
+       if (socket_type == TCP_SOCKET) {
+               server_sock = socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP);
+       } else {
+               assert(socket_type == UDP_SOCKET);
+               server_sock = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
+       }

        if (server_sock == -1) {
        if (server_sock == -1) {

-               perror("socket");
+               log_perror("socket");

                exit(1);
        }
 
        int one = 1;
        if (setsockopt(server_sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) == -1) {
                exit(1);
        }
 
        int one = 1;
        if (setsockopt(server_sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) == -1) {

-               perror("setsockopt(SO_REUSEADDR)");
+               log_perror("setsockopt(SO_REUSEADDR)");

                exit(1);
        }
 
        // We want dual-stack sockets. (Sorry, OpenBSD and Windows XP...)
        int zero = 0;
        if (setsockopt(server_sock, IPPROTO_IPV6, IPV6_V6ONLY, &zero, sizeof(zero)) == -1) {
                exit(1);
        }
 
        // We want dual-stack sockets. (Sorry, OpenBSD and Windows XP...)
        int zero = 0;
        if (setsockopt(server_sock, IPPROTO_IPV6, IPV6_V6ONLY, &zero, sizeof(zero)) == -1) {

-               perror("setsockopt(IPV6_V6ONLY)");
+               log_perror("setsockopt(IPV6_V6ONLY)");

                exit(1);
        }
 
        // Set as non-blocking, so the acceptor thread can notice that we want to shut it down.
        if (ioctl(server_sock, FIONBIO, &one) == -1) {
                exit(1);
        }
 
        // Set as non-blocking, so the acceptor thread can notice that we want to shut it down.
        if (ioctl(server_sock, FIONBIO, &one) == -1) {

-               perror("ioctl(FIONBIO)");
+               log_perror("ioctl(FIONBIO)");

                exit(1);
        }
 
                exit(1);
        }
 


@@ -49,47 +58,53 @@ int create_server_socket(int port)
        addr.sin6_port = htons(port);
 
        if (bind(server_sock, reinterpret_cast<sockaddr *>(&addr), sizeof(addr)) == -1) {
        addr.sin6_port = htons(port);
 
        if (bind(server_sock, reinterpret_cast<sockaddr *>(&addr), sizeof(addr)) == -1) {

-               perror("bind");
+               log_perror("bind");

                exit(1);
        }
 
                exit(1);
        }
 

-       if (listen(server_sock, 128) == -1) {
-               perror("listen");
-               exit(1);
+       if (socket_type == TCP_SOCKET) {
+               if (listen(server_sock, 128) == -1) {
+                       log_perror("listen");
+                       exit(1);
+               }

        }
 
        return server_sock;
 }
        
        }
 
        return server_sock;
 }
        

-AcceptorThread::AcceptorThread(int server_sock)
-       : server_sock(server_sock)
+Acceptor::Acceptor(int server_sock, int port)
+       : server_sock(server_sock),
+         port(port)

 {
 }
 
 {
 }
 

-void AcceptorThread::run()
+Acceptor::Acceptor(const AcceptorProto &serialized)
+       : server_sock(serialized.server_sock()),
+         port(serialized.port())

 {
 {

-       should_stop = false;
-       pthread_create(&worker_thread, NULL, &AcceptorThread::do_work_thunk, this);

 }
 
 }
 

-void AcceptorThread::stop()
+AcceptorProto Acceptor::serialize() const

 {
 {

-       should_stop = true;
-       pthread_kill(worker_thread, SIGHUP);
-       if (pthread_join(worker_thread, NULL) == -1) {
-               perror("pthread_join");
-               exit(1);
-       }
+       AcceptorProto serialized;
+       serialized.set_server_sock(server_sock);
+       serialized.set_port(port);
+       return serialized;

 }
 
 }
 

-void *AcceptorThread::do_work_thunk(void *arg)
+void Acceptor::close_socket()

 {
 {

-       AcceptorThread *acceptor_thread = reinterpret_cast<AcceptorThread *>(arg);
-       acceptor_thread->do_work();
-       return NULL;
+       int ret;
+       do {
+               ret = close(server_sock);
+       } while (ret == -1 && errno == EINTR);
+
+       if (ret == -1) {
+               log_perror("close");
+       }

 }
 
 }
 

-void AcceptorThread::do_work()
+void Acceptor::do_work()

 {
        while (!hupped) {
                // Since we are non-blocking, we need to wait for the right state first.
 {
        while (!hupped) {
                // Since we are non-blocking, we need to wait for the right state first.


@@ -103,7 +118,7 @@ void AcceptorThread::do_work()
                        continue;
                }
                if (nfds == -1) {
                        continue;
                }
                if (nfds == -1) {

-                       perror("poll");
+                       log_perror("poll");

                        usleep(100000);
                        continue;
                }
                        usleep(100000);
                        continue;
                }


@@ -117,7 +132,7 @@ void AcceptorThread::do_work()
                        continue;
                }
                if (sock == -1) {
                        continue;
                }
                if (sock == -1) {

-                       perror("accept");
+                       log_perror("accept");

                        usleep(100000);
                        continue;
                }
                        usleep(100000);
                        continue;
                }


@@ -125,7 +140,7 @@ void AcceptorThread::do_work()
                // Set the socket as nonblocking.
                int one = 1;
                if (ioctl(sock, FIONBIO, &one) == -1) {
                // Set the socket as nonblocking.
                int one = 1;
                if (ioctl(sock, FIONBIO, &one) == -1) {

-                       perror("FIONBIO");
+                       log_perror("FIONBIO");

                        exit(1);
                }
 
                        exit(1);
                }