Skip to content

Refactor some ext/pcre code for performance #12447

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
merged 11 commits into from
Oct 16, 2023
Merged

Refactor some ext/pcre code for performance #12447

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e4e0c0b
Always inline populate_match_value and fix argument type
nielsdos Oct 15, 2023
407a439
Use _new variant of zend_hash in some places to avoid additional check
nielsdos Oct 15, 2023
d000648
Move allocation of match_sets down to simplify and reduce code size
nielsdos Oct 15, 2023
83d3963
Move pcre2_get_ovector_pointer out of the loop
nielsdos Oct 15, 2023
35ea734
Mark error condition as cold block
nielsdos Oct 15, 2023
80d6e10
Simplify condition: subpats is already checked
nielsdos Oct 15, 2023
6d1c9d8
Move array size preallocation to use allocate the up-to-date size
nielsdos Oct 15, 2023
3eb8cf9
Simplify condition
nielsdos Oct 15, 2023
26d1d60
Rework internal functions to avoid repeated unwrapping
nielsdos Oct 15, 2023
700ec69
Remember Z_ARRVAL_P(return_value)
nielsdos Oct 15, 2023
51c46f5
Mark some pointers as const
nielsdos Oct 16, 2023
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
16 changes: 8 additions & 8 deletions ext/pcre/php_pcre.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,6 +1239,8 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, zend_string *subject_str,
}
}

offsets = pcre2_get_ovector_pointer(match_data);

orig_start_offset = start_offset2;
options =
(pce->compile_options & PCRE2_UTF) && !is_known_valid_utf8(subject_str, orig_start_offset)
Expand Down Expand Up @@ -1266,8 +1268,6 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, zend_string *subject_str,
matched:
matched++;

offsets = pcre2_get_ovector_pointer(match_data);

/* If subpatterns array has been passed, fill it in with values. */
if (subpats != NULL) {
/* Try to get the list of substrings and display a warning if failed. */
Expand Down Expand Up @@ -1606,6 +1606,8 @@ PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, zend_string *su

options = (pce->compile_options & PCRE2_UTF) ? 0 : PCRE2_NO_UTF_CHECK;

offsets = pcre2_get_ovector_pointer(match_data);

/* Execute the regular expression. */
#ifdef HAVE_PCRE_JIT_SUPPORT
if ((pce->preg_options & PREG_JIT) && options) {
Expand All @@ -1629,8 +1631,6 @@ PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, zend_string *su
}

matched:
offsets = pcre2_get_ovector_pointer(match_data);

if (UNEXPECTED(offsets[1] < offsets[0])) {
PCRE_G(error_code) = PHP_PCRE_INTERNAL_ERROR;
if (result) {
Expand Down Expand Up @@ -1862,6 +1862,8 @@ static zend_string *php_pcre_replace_func_impl(pcre_cache_entry *pce, zend_strin

options = (pce->compile_options & PCRE2_UTF) ? 0 : PCRE2_NO_UTF_CHECK;

offsets = pcre2_get_ovector_pointer(match_data);

/* Execute the regular expression. */
#ifdef HAVE_PCRE_JIT_SUPPORT
if ((pce->preg_options & PREG_JIT) && options) {
Expand All @@ -1883,8 +1885,6 @@ static zend_string *php_pcre_replace_func_impl(pcre_cache_entry *pce, zend_strin
}

matched:
offsets = pcre2_get_ovector_pointer(match_data);

if (UNEXPECTED(offsets[1] < offsets[0])) {
PCRE_G(error_code) = PHP_PCRE_INTERNAL_ERROR;
if (result) {
Expand Down Expand Up @@ -2533,6 +2533,8 @@ PHPAPI void php_pcre_split_impl(pcre_cache_entry *pce, zend_string *subject_str,

options = (pce->compile_options & PCRE2_UTF) ? 0 : PCRE2_NO_UTF_CHECK;

offsets = pcre2_get_ovector_pointer(match_data);

#ifdef HAVE_PCRE_JIT_SUPPORT
if ((pce->preg_options & PREG_JIT) && options) {
count = pcre2_jit_match(pce->re, (PCRE2_SPTR)subject, ZSTR_LEN(subject_str), start_offset,
Expand All @@ -2552,8 +2554,6 @@ PHPAPI void php_pcre_split_impl(pcre_cache_entry *pce, zend_string *subject_str,
}

matched:
offsets = pcre2_get_ovector_pointer(match_data);

if (UNEXPECTED(offsets[1] < offsets[0])) {
PCRE_G(error_code) = PHP_PCRE_INTERNAL_ERROR;
break;
Expand Down