weaselab/weaseldb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix EINTR handling for close

Browse Source
This commit is contained in:
Andrew Noyes
2025-08-23 20:14:24 -04:00
parent 7db0e331e4
commit 18a1b30d9f
6 changed files with 86 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/server.cpp
View File

@@ -59,27 +59,30 @@ Server::Server(const weaseldb::Config &config, ConnectionHandler &handler,
Server::~Server() {
if (shutdown_pipe_[0] != -1) {
int e;
do {
e = close(shutdown_pipe_[0]);
} while (e == -1 && errno == EINTR);
int e = close(shutdown_pipe_[0]);
if (e == -1 && errno != EINTR) {
perror("close shutdown_pipe_[0]");
std::abort();
}
shutdown_pipe_[0] = -1;
}
if (shutdown_pipe_[1] != -1) {
int e;
do {
e = close(shutdown_pipe_[1]);
} while (e == -1 && errno == EINTR);
int e = close(shutdown_pipe_[1]);
if (e == -1 && errno != EINTR) {
perror("close shutdown_pipe_[1]");
std::abort();
}
shutdown_pipe_[1] = -1;
}
// Close all epoll instances
for (int epollfd : epoll_fds_) {
if (epollfd != -1) {
int e;
do {
e = close(epollfd);
} while (e == -1 && errno == EINTR);
int e = close(epollfd);
if (e == -1 && errno != EINTR) {
perror("close epollfd");
std::abort();
}
}
}
epoll_fds_.clear();
@@ -87,10 +90,11 @@ Server::~Server() {
// Close all listen sockets (Server always owns them)
for (int fd : listen_fds_) {
if (fd != -1) {
int e;
do {
e = close(fd);
} while (e == -1 && errno == EINTR);
int e = close(fd);
if (e == -1 && errno != EINTR) {
perror("close listen_fd");
std::abort();
}
}
}
@@ -226,13 +230,16 @@ int Server::createLocalConnection() {
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, server_fd, &event) == -1) {
perror("epoll_ctl ADD local connection");
connection_registry_.remove(server_fd);
int e;
do {
e = close(server_fd);
} while (e == -1 && errno == EINTR);
do {
e = close(client_fd);
} while (e == -1 && errno == EINTR);
int e = close(server_fd);
if (e == -1 && errno != EINTR) {
perror("close server_fd");
std::abort();
}
e = close(client_fd);
if (e == -1 && errno != EINTR) {
perror("close client_fd");
std::abort();
}
return -1;
}
@@ -384,10 +391,11 @@ void Server::start_io_threads(std::vector<std::thread> &threads) {
if (config_.server.max_connections > 0 &&
active_connections_.load(std::memory_order_relaxed) >=
config_.server.max_connections) {
int e;
do {
e = close(fd);
} while (e == -1 && errno == EINTR);
int e = close(fd);
if (e == -1 && errno != EINTR) {
perror("close fd (max connections)");
std::abort();
}
continue;
}