Skip to content

tds_select: Treat EAGAIN and EINPROGRESS like EINTR. #587

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

Merged
freddy77 merged 1 commit into from
Jun 1, 2024
Merged

tds_select: Treat EAGAIN and EINPROGRESS like EINTR. #587

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
7 changes: 6 additions & 1 deletion src/tds/net.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,8 @@ tds_select(TDSSOCKET * tds, unsigned tds_sel, int timeout_seconds)

switch (sock_errno) {
case TDSSOCK_EINTR:
case EAGAIN:
case TDSSOCK_EINPROGRESS:
/* FIXME this should be global maximun, not loop one */
seconds += poll_seconds;
break; /* let interrupt handler be called */
Expand All @@ -683,7 +685,10 @@ tds_select(TDSSOCKET * tds, unsigned tds_sel, int timeout_seconds)
}
}

assert(rc == 0 || (rc < 0 && sock_errno == TDSSOCK_EINTR));
assert(rc == 0 || (rc < 0 && (sock_errno == TDSSOCK_EINTR ||
sock_errno == EAGAIN ||
sock_errno == TDSSOCK_EINPROGRESS
)));

if (tds_get_ctx(tds) && tds_get_ctx(tds)->int_handler) { /* interrupt handler installed */
/*
Expand Down