Skip to content

poll: fetch method ptr directly #22816

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
Girgias merged 2 commits into from
Jul 20, 2026
+11 −15
Merged

poll: fetch method ptr directly #22816

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9073494
poll: fetch method ptr directly
Girgias Jul 19, 2026
bae472e
Review comments
Girgias Jul 20, 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
26 changes: 11 additions & 15 deletions main/poll/poll_handle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,22 @@
static php_socket_t php_poll_handle_default_get_fd(php_poll_handle_object *handle)
{
zval retval;
zval obj;
zval func_name;

ZVAL_OBJ(&obj, &handle->std);

/* Prepare function name as zval */
ZVAL_STRING(&func_name, "getFileDescriptor");
/* Grab getFileDescriptor() method pointer which is stored in lowercase in the function table */
zend_function *method = zend_hash_str_find_ptr_lc(&handle->std.ce->function_table, ZEND_STRL("getfiledescriptor"));
ZEND_ASSERT(method && "no default method???");

/* Call getFileDescriptor() method */
if (EXPECTED(call_user_function(NULL, &obj, &func_name, &retval, 0, NULL) == SUCCESS)) {
if (Z_TYPE(retval) == IS_LONG) {
php_socket_t fd = Z_LVAL(retval) < 0 ? SOCK_ERR : (php_socket_t) Z_LVAL(retval);
zval_ptr_dtor(&retval);
zval_ptr_dtor(&func_name); /* Clean up function name */
return fd;
}
zval_ptr_dtor(&retval);
zend_call_known_function(method, &handle->std, handle->std.ce, &retval, 0, NULL, NULL);

/* No need to deref the return value as the class is final and thus the method cannot be changed to return by-ref */
if (EXPECTED(Z_TYPE(retval) == IS_LONG)) {
Comment thread
Girgias marked this conversation as resolved.
php_socket_t fd = Z_LVAL(retval) < 0 ? SOCK_ERR : (php_socket_t) Z_LVAL(retval);
/* No need to clean the retval as we know it is an integer, and thus it's just on the stack */
return fd;
}

zval_ptr_dtor(&func_name); /* Clean up function name */
zval_ptr_dtor(&retval);
return SOCK_ERR; /* Invalid socket */
}

Expand Down
Loading