Avoid temporary string allocations in php_mb_parse_encoding_list() #12714
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
This brings execution time down from 0.91s to 0.86s on the reference benchmark [1]. [1] php#12684 (comment)
Girgias
approved these changes
Nov 18, 2023
| @@ -285,6 +285,7 @@ static inline void mb_convert_buf_reset(mb_convert_buf *buf, size_t len) | |||
| } | |||
|
|
|||
| MBFLAPI extern const mbfl_encoding *mbfl_name2encoding(const char *name); | |||
| MBFLAPI extern const mbfl_encoding *mbfl_name2encoding_ex(const char *name, size_t name_len); | |||
There was a problem hiding this comment.
This new function can be used in more places
There was a problem hiding this comment.
Yeah, there are places where we can pass ZSTR_LEN(something). Although that would be a behaviour change because those places seem to allow \0 in strings (the function was never able to handle \0 in strings and silently cut off the string there, but passing ZSTR_LEN would thus change the \0 behaviour). I see you're making a PR to refactor some stuff anyway, so feel free to take a look at those places :)
alexdowad
reviewed
Nov 18, 2023
ext/mbstring/mbstring.c
Outdated
| @@ -300,15 +308,15 @@ static zend_result php_mb_parse_encoding_list(const char *value, size_t value_le | |||
| } else { | |||
| bool included_auto; | |||
| size_t n, size; | |||
| char *p1, *endp, *tmpstr; | |||
| const char *p1, *endp, *tmpstr; | |||
| const mbfl_encoding **entry, **list; | |||
|
|
|||
| /* copy the value string for work */ | |||
There was a problem hiding this comment.
Looks like this comment is now redundant, not so?
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.
This brings execution time down from 0.91s to 0.86s on the reference benchmark [1]. (The execution time was measured with this PR on top of my earlier open PR #12712)
[1] #12684 (comment)