X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=acceptor.cpp;h=87bf47b83ea1b1c09616fbd19c0410c6834bfc20;hp=776f39b6c3f54e7e2ad0377aeb7d28c27bfb0d74;hb=7c4707af4ea7af05e34bc0414d18d9fd54e4f23e;hpb=156897c8a6c7b86cb244d74911528de5c28f2134

diff --git a/acceptor.cpp b/acceptor.cpp
index 776f39b..87bf47b 100644
--- a/acceptor.cpp
+++ b/acceptor.cpp
@@ -10,6 +10,7 @@
 
 #include "acceptor.h"
 #include "serverpool.h"
+#include "state.pb.h"
 
 using namespace std;
 
@@ -61,35 +62,39 @@ int create_server_socket(int port)
 	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) {
+		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.