Optimize PHP html_entity_decode function #18092
Open
+115
−83
Conversation
This file contains 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
…mize scanning for '&' and ';' using memchr Use memcpy instead of character-by-character copying language
ArtUkrainskiy
force-pushed
the
html_entity_decode/improve-memchr
branch
from
d166abe to
66f5709
Compare
Girgias
reviewed
Mar 17, 2025
ext/standard/html.c
Outdated
| char *output_ptr = ZSTR_VAL(output); | ||
| int doctype = flags & ENT_HTML_DOC_TYPE_MASK; | ||
|
|
||
| assert(*input_end == '\0'); |
There was a problem hiding this comment.
If you change the input parameter to a zend_string* you'd be guaranteed this. Moreover, please use ZEND_ASSERT() instead.
ext/standard/html.c
Outdated
|
|
||
| unsigned code = 0, code2 = 0; | ||
| const char *entity_end_ptr = NULL; | ||
| int valid_entity = 1; |
There was a problem hiding this comment.
Suggested change
| int valid_entity = 1; | |
| bool valid_entity = true; |
|
@Girgias are you going to review the logic as well? Just checking if I should look into this or if you are happy to handle it all? |
Please do review the logic, I only had a cursory glance :) |
|
Ok I will check it out next week if no one is quicker. |
fix logic
ArtUkrainskiy
force-pushed
the
html_entity_decode/improve-memchr
branch
from
9b3e96d to
f093c30
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Improvements affect the C function
traverse_for_entities:memchrto search for '&' instead of scanning character by character.memchrto locate ';' to determine potential entity boundaries instead ofprocess_named_entity_html, avoiding unnecessary per-character validations.memcpyinstead of character-by-character copying.Benchmark for 4K-character strings :
All tests are passed!