ext/standard: Refactor tick and shutdown functions #17295
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Girgias
force-pushed
the
tick-shutdown-fcc-equals-fix
branch
from
198a8f4 to
5eb00ca
Compare
Girgias
force-pushed
the
tick-shutdown-fcc-equals-fix
branch
2 times, most recently
from
e772b06 to
75aaccc
Compare
nielsdos
requested changes
Dec 29, 2024
ext/standard/basic_functions.c
Outdated
| Z_PARAM_FUNC_NO_TRAMPOLINE_FREE(fci, tick_fe.fci_cache) | ||
| ZEND_PARSE_PARAMETERS_END(); | ||
|
|
||
| if (!BG(user_tick_functions)) { |
There was a problem hiding this comment.
Shouldn't you free the trampoline in this early return?
You can consolidate the freeing by inverting the if condition and placing the zend_llist_del_element call inside the if.
There was a problem hiding this comment.
Added a test and did your fix
| uint32_t param_count = 0; | ||
|
|
||
| if (zend_parse_parameters(ZEND_NUM_ARGS(), "f*", &tick_fe.fci, &tick_fe.fci_cache, ¶ms, ¶m_count) == FAILURE) { | ||
| if (zend_parse_parameters(ZEND_NUM_ARGS(), "F*", &fci, &tick_fe.fci_cache, ¶ms, &tick_fe.param_count) == FAILURE) { |
There was a problem hiding this comment.
The change from f to F means that the function never worked for trampolines, right?
There was a problem hiding this comment.
It did because the callable was stored in the FCI, and it was fetched at each call from the function_name zval of the FCI.
I did think this as well at the beginning and so wrote the tests first.
Remove usage of FCI and store the parameters and count of it directly on the relevant structures This reduces the size of the structs by ~50
Girgias
force-pushed
the
tick-shutdown-fcc-equals-fix
branch
from
75aaccc to
190c4c3
Compare
nielsdos
approved these changes
Dec 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove usage of FCI and store the parameters and count of it directly on the relevant structures
This reduces the size of the structs by ~50%