Skip to content

Honour a de-armed READABLE in read_more; drop the fcntl pair after SOCK_NONBLOCK #257

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
jimmyolo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Honour a de-armed READABLE in read_more; drop the fcntl pair after SOCK_NONBLOCK #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
134cd2b
Stop the read_more loop once the poll mask no longer has READABLE
jimmyolo Sep 3, 2026
5b9e9a8
Skip bsd_set_nonblocking on sockets created with SOCK_NONBLOCK
jimmyolo Sep 3, 2026
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
8 changes: 8 additions & 0 deletions src/bsd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,11 @@ LIBUS_SOCKET_DESCRIPTOR bsd_create_socket(int domain, int type, int protocol) {

LIBUS_SOCKET_DESCRIPTOR created_fd = socket(domain, type | flags, protocol);

#if defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK)
return apple_no_sigpipe(created_fd);
#else
return bsd_set_nonblocking(apple_no_sigpipe(created_fd));
#endif
}

void bsd_close_socket(LIBUS_SOCKET_DESCRIPTOR fd) {
Expand Down Expand Up @@ -400,7 +404,11 @@ LIBUS_SOCKET_DESCRIPTOR bsd_accept_socket(LIBUS_SOCKET_DESCRIPTOR fd, struct bsd

internal_finalize_bsd_addr(addr);

#if defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK)
return apple_no_sigpipe(accepted_fd);
#else
return bsd_set_nonblocking(apple_no_sigpipe(accepted_fd));
#endif
}

int bsd_recv(LIBUS_SOCKET_DESCRIPTOR fd, void *buf, int length, int flags) {
Expand Down
3 changes: 2 additions & 1 deletion src/loop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,8 @@ void us_internal_dispatch_ready_poll(struct us_poll_t *p, int error, int events)
/* If we filled the entire recv buffer, we need to immediately read again since otherwise a
* pending hangup event in the same even loop iteration can close the socket before we get
* the chance to read again next iteration */
if (length == LIBUS_RECV_BUFFER_LENGTH && s && !us_socket_is_closed(0, s)) {
if (length == LIBUS_RECV_BUFFER_LENGTH && s && !us_socket_is_closed(0, s)
&& (us_poll_events(&s->p) & LIBUS_SOCKET_READABLE)) {
goto read_more;
}

Expand Down