#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)
{
void Acceptor::close_socket()
{
- safe_close(server_sock);
+ int ret;
+ do {
+ ret = close(server_sock);
+ } while (ret == -1 && errno == EINTR);
+
+ if (ret == -1) {
+ log_perror("close");
+ }
}
void Acceptor::do_work()
{
- while (!should_stop()) {
- if (!wait_for_activity(server_sock, POLLIN, NULL)) {
+ 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);
continue;
}