Skip to content

fix: Use poll() for connect timeout on UNIX to avoid FD_SETSIZE limit #800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tkarthikan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Use poll() for connect timeout on UNIX to avoid FD_SETSIZE limit #800

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions base/hsocket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

#include "hdef.h"

#ifdef OS_UNIX
#include <poll.h>
#endif

#ifdef OS_WIN
#include "hatomic.h"
static hatomic_flag_t s_wsa_initialized = HATOMIC_FLAG_INIT;
Expand Down Expand Up @@ -260,6 +264,20 @@ static int ListenFD(int sockfd) {
static int ConnectFDTimeout(int connfd, int ms) {
int err = 0;
socklen_t optlen = sizeof(err);

#ifdef OS_UNIX
// Use poll() to avoid FD_SETSIZE limit (fd >= 1024 crashes with select)
struct pollfd pfd;
pfd.fd = connfd;
pfd.events = POLLOUT;
pfd.revents = 0;
int ret = poll(&pfd, 1, ms);
if (ret < 0) {
perror("poll");
goto error;
}
#else
// Windows: select() is safe (fd_set uses different implementation)
struct timeval tv = { ms / 1000, (ms % 1000) * 1000 };
fd_set writefds;
FD_ZERO(&writefds);
Expand All @@ -269,6 +287,7 @@ static int ConnectFDTimeout(int connfd, int ms) {
perror("select");
goto error;
}
#endif
if (ret == 0) {
errno = ETIMEDOUT;
goto error;
Expand Down