Skip to content

Map epoll_ctl() errors through php_poll_errno_to_error() #23805

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
bukka merged 1 commit into from
Sep 21, 2026
+45 −3
Merged

Map epoll_ctl() errors through php_poll_errno_to_error() #23805

Show file tree
Hide file tree
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
36 changes: 36 additions & 0 deletions ext/standard/tests/poll/poll_stream_add_unpollable.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
--TEST--
Io\Poll: epoll reports a handle it cannot watch as unsupported
--SKIPIF--
<?php
require_once __DIR__ . '/poll.inc';
if ('Epoll' !== pt_new_stream_poll()->getBackend()->name) {
die("skip requires the epoll backend\n");
}
?>
--FILE--
<?php
require_once __DIR__ . '/poll.inc';

$ctx = pt_new_stream_poll();

// epoll_ctl() rejects files that do not implement polling
foreach (['regular file' => fopen(__FILE__, 'r'), '/dev/null' => fopen('/dev/null', 'r')] as $label => $stream) {
try {
$ctx->add(new StreamPollHandle($stream), [Io\Poll\Event::Read]);
echo "$label: added\n";
} catch (Io\Poll\FailedHandleAddException $e) {
printf("%s: %s, code %s\n", $label, $e->getMessage(),
Io\Poll\FailedPollOperationException::ERROR_NOSUPPORT === $e->getCode() ? 'ERROR_NOSUPPORT' : $e->getCode());
}
fclose($stream);
}

// a pollable handle still works
[$r, $w] = pt_new_socket_pair();
$ctx->add(new StreamPollHandle($r), [Io\Poll\Event::Read]);
echo "socket: added\n";
?>
--EXPECT--
regular file: Failed to add handle, code ERROR_NOSUPPORT
/dev/null: Failed to add handle, code ERROR_NOSUPPORT
socket: added
12 changes: 9 additions & 3 deletions main/poll/poll_backend_epoll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,13 @@ static zend_result epoll_backend_add(php_poll_ctx *ctx, int fd, uint32_t events,
ev.data.ptr = data;

if (epoll_ctl(backend_data->epoll_fd, EPOLL_CTL_ADD, fd, &ev) == -1) {
php_poll_set_error(ctx, (errno == EEXIST) ? PHP_POLL_ERR_EXISTS : PHP_POLL_ERR_SYSTEM);
/* EPERM means the target file does not implement polling, which is the case
* for regular files and for character devices such as /dev/null. */
if (errno == EPERM) {
php_poll_set_error(ctx, PHP_POLL_ERR_NOSUPPORT);
} else {
php_poll_set_current_errno_error(ctx);
}
return FAILURE;
}
backend_data->fd_count++;
Expand All @@ -142,7 +148,7 @@ static zend_result epoll_backend_modify(php_poll_ctx *ctx, int fd, uint32_t even
ev.data.ptr = data;

if (epoll_ctl(backend_data->epoll_fd, EPOLL_CTL_MOD, fd, &ev) == -1) {
php_poll_set_error(ctx, (errno == ENOENT) ? PHP_POLL_ERR_NOTFOUND : PHP_POLL_ERR_SYSTEM);
php_poll_set_current_errno_error(ctx);
return FAILURE;
}

Expand All @@ -154,7 +160,7 @@ static zend_result epoll_backend_remove(php_poll_ctx *ctx, int fd)
epoll_backend_data_t *backend_data = (epoll_backend_data_t *) ctx->backend_data;

if (epoll_ctl(backend_data->epoll_fd, EPOLL_CTL_DEL, fd, NULL) == -1) {
php_poll_set_error(ctx, (errno == ENOENT) ? PHP_POLL_ERR_NOTFOUND : PHP_POLL_ERR_SYSTEM);
php_poll_set_current_errno_error(ctx);
return FAILURE;
}
backend_data->fd_count--;
Expand Down
Loading