Skip to content

Load the epoll_pwait2 availability flag once per wait #24026

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
bukka wants to merge 1 commit into
base: PHP-8.6
Choose a base branch
from
Open

Load the epoll_pwait2 availability flag once per wait #24026

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: 11 additions & 8 deletions main/poll/poll_backend_epoll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,21 +191,24 @@ static int epoll_backend_wait(
backend_data->events_capacity = max_events;
}

int nfds = 0;
int nfds;
#ifdef HAVE_EPOLL_PWAIT2
if (EXPECTED(zend_atomic_bool_load_ex(&epoll_pwait2_available))) {
if (zend_atomic_bool_load_ex(&epoll_pwait2_available)) {
nfds = epoll_pwait2(
backend_data->epoll_fd, backend_data->events, max_events, timeout, NULL);
if (UNEXPECTED(nfds < 0 && (errno == ENOSYS || errno == ENOTSUP))) {
if (nfds < 0 && (errno == ENOSYS || errno == ENOTSUP)) {
zend_atomic_bool_store_ex(&epoll_pwait2_available, false);
goto epoll_wait_fallback;
}
} else {
epoll_wait_fallback:
nfds = epoll_wait(backend_data->epoll_fd, backend_data->events, max_events,
php_poll_timespec_to_ms(timeout));
}
if (UNEXPECTED(!zend_atomic_bool_load_ex(&epoll_pwait2_available)))
#else
nfds = epoll_wait(backend_data->epoll_fd, backend_data->events, max_events,
php_poll_timespec_to_ms(timeout));
#endif
{
int timeout_ms = php_poll_timespec_to_ms(timeout);
nfds = epoll_wait(backend_data->epoll_fd, backend_data->events, max_events, timeout_ms);
}

if (nfds > 0) {
for (int i = 0; i < nfds; i++) {
Expand Down
Loading