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
+79 −69
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
69 changes: 39 additions & 30 deletions ext/pcre/php_pcre.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,13 +963,13 @@ static zend_always_inline void populate_match_value(
}

static inline void add_named(
zval *subpats, zend_string *name, zval *val, bool unmatched) {
HashTable *subpats, zend_string *name, zval *val, bool unmatched) {
/* If the DUPNAMES option is used, multiple subpatterns might have the same name.
* In this case we want to preserve the one that actually has a value. */
if (!unmatched) {
zend_hash_update(Z_ARRVAL_P(subpats), name, val);
zend_hash_update(subpats, name, val);
} else {
if (!zend_hash_add(Z_ARRVAL_P(subpats), name, val)) {
if (!zend_hash_add(subpats, name, val)) {
return;
}
}
Expand All @@ -978,7 +978,7 @@ static inline void add_named(

/* {{{ add_offset_pair */
static inline void add_offset_pair(
zval *result, const char *subject, PCRE2_SIZE start_offset, PCRE2_SIZE end_offset,
HashTable *result, const char *subject, PCRE2_SIZE start_offset, PCRE2_SIZE end_offset,
zend_string *name, uint32_t unmatched_as_null)
{
zval match_pair;
Expand Down Expand Up @@ -1006,7 +1006,7 @@ static inline void add_offset_pair(
if (name) {
add_named(result, name, &match_pair, start_offset == PCRE2_UNSET);
}
zend_hash_next_index_insert_new(Z_ARRVAL_P(result), &match_pair);
zend_hash_next_index_insert_new(result, &match_pair);
}
/* }}} */

Expand All @@ -1017,53 +1017,54 @@ static void populate_subpat_array(
bool unmatched_as_null = (flags & PREG_UNMATCHED_AS_NULL) != 0;
zval val;
int i;
HashTable *subpats_ht = Z_ARRVAL_P(subpats);
if (subpat_names) {
if (offset_capture) {
for (i = 0; i < count; i++) {
add_offset_pair(
subpats, subject, offsets[2*i], offsets[2*i+1],
subpats_ht, subject, offsets[2*i], offsets[2*i+1],
subpat_names[i], unmatched_as_null);
}
if (unmatched_as_null) {
for (i = count; i < num_subpats; i++) {
add_offset_pair(subpats, NULL, PCRE2_UNSET, PCRE2_UNSET, subpat_names[i], 1);
add_offset_pair(subpats_ht, NULL, PCRE2_UNSET, PCRE2_UNSET, subpat_names[i], 1);
}
}
} else {
for (i = 0; i < count; i++) {
populate_match_value(
&val, subject, offsets[2*i], offsets[2*i+1], unmatched_as_null);
if (subpat_names[i]) {
add_named(subpats, subpat_names[i], &val, offsets[2*i] == PCRE2_UNSET);
add_named(subpats_ht, subpat_names[i], &val, offsets[2*i] == PCRE2_UNSET);
}
zend_hash_next_index_insert_new(Z_ARRVAL_P(subpats), &val);
zend_hash_next_index_insert_new(subpats_ht, &val);
}
if (unmatched_as_null) {
for (i = count; i < num_subpats; i++) {
ZVAL_NULL(&val);
if (subpat_names[i]) {
zend_hash_add(Z_ARRVAL_P(subpats), subpat_names[i], &val);
zend_hash_add(subpats_ht, subpat_names[i], &val);
}
zend_hash_next_index_insert_new(Z_ARRVAL_P(subpats), &val);
zend_hash_next_index_insert_new(subpats_ht, &val);
}
}
}
} else {
if (offset_capture) {
for (i = 0; i < count; i++) {
add_offset_pair(
subpats, subject, offsets[2*i], offsets[2*i+1], NULL, unmatched_as_null);
subpats_ht, subject, offsets[2*i], offsets[2*i+1], NULL, unmatched_as_null);
}
if (unmatched_as_null) {
for (i = count; i < num_subpats; i++) {
add_offset_pair(subpats, NULL, PCRE2_UNSET, PCRE2_UNSET, NULL, 1);
add_offset_pair(subpats_ht, NULL, PCRE2_UNSET, PCRE2_UNSET, NULL, 1);
}
}
} else {
for (i = 0; i < count; i++) {
populate_match_value(
&val, subject, offsets[2*i], offsets[2*i+1], unmatched_as_null);
zend_hash_next_index_insert_new(Z_ARRVAL_P(subpats), &val);
zend_hash_next_index_insert_new(subpats_ht, &val);
}
if (unmatched_as_null) {
for (i = count; i < num_subpats; i++) {
Expand Down Expand Up @@ -1129,9 +1130,9 @@ static zend_always_inline bool is_known_valid_utf8(
PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, zend_string *subject_str, zval *return_value,
zval *subpats, int global, int use_flags, zend_long flags, zend_off_t start_offset)
{
zval result_set, /* Holds a set of subpatterns after
zval result_set; /* Holds a set of subpatterns after
a global match */
*match_sets = NULL; /* An array of sets of matches for each
HashTable **match_sets = NULL; /* An array of sets of matches for each
subpattern after a global match */
uint32_t options; /* Execution options */
int count; /* Count of matched subpatterns */
Expand Down Expand Up @@ -1233,9 +1234,9 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, zend_string *subject_str,

/* Allocate match sets array and initialize the values. */
if (global && subpats && subpats_order == PREG_PATTERN_ORDER) {
match_sets = (zval *)safe_emalloc(num_subpats, sizeof(zval), 0);
match_sets = safe_emalloc(num_subpats, sizeof(HashTable *), 0);
for (i=0; i<num_subpats; i++) {
array_init(&match_sets[i]);
match_sets[i] = zend_new_array(0);
}
}

Expand Down Expand Up @@ -1286,15 +1287,15 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, zend_string *subject_str,
if (offset_capture) {
for (i = 0; i < count; i++) {
add_offset_pair(
&match_sets[i], subject, offsets[2*i], offsets[2*i+1],
match_sets[i], subject, offsets[2*i], offsets[2*i+1],
NULL, unmatched_as_null);
}
} else {
for (i = 0; i < count; i++) {
zval val;
populate_match_value(
&val, subject, offsets[2*i], offsets[2*i+1], unmatched_as_null);
zend_hash_next_index_insert_new(Z_ARRVAL(match_sets[i]), &val);
zend_hash_next_index_insert_new(match_sets[i], &val);
}
}
mark = pcre2_get_mark(match_data);
Expand All @@ -1314,12 +1315,16 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, zend_string *subject_str,
for (; i < num_subpats; i++) {
if (offset_capture) {
add_offset_pair(
&match_sets[i], NULL, PCRE2_UNSET, PCRE2_UNSET,
match_sets[i], NULL, PCRE2_UNSET, PCRE2_UNSET,
NULL, unmatched_as_null);
} else if (unmatched_as_null) {
add_next_index_null(&match_sets[i]);
zval tmp;
ZVAL_NULL(&tmp);
zend_hash_next_index_insert_new(match_sets[i], &tmp);
Comment on lines +1321 to +1323
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We really should add zend_hash APIs to deal with those cases.
We have add_index_*() and add_assoc_*() when the array is wrapped in a zval but nothing when working with a HashTable directly.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably, but it's worth checking first if this occurs often before adding more public APIs. I don't know off the top of my head how common this is.
In any case, I'm not gonna deal with it in this PR :p

} else {
add_next_index_str(&match_sets[i], ZSTR_EMPTY_ALLOC());
zval tmp;
ZVAL_EMPTY_STRING(&tmp);
zend_hash_next_index_insert_new(match_sets[i], &tmp);
}
}
}
Expand Down Expand Up @@ -1408,15 +1413,19 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, zend_string *subject_str,
if (match_sets) {
if (subpat_names) {
for (i = 0; i < num_subpats; i++) {
zval wrapper;
ZVAL_ARR(&wrapper, match_sets[i]);
if (subpat_names[i]) {
zend_hash_update(Z_ARRVAL_P(subpats), subpat_names[i], &match_sets[i]);
Z_ADDREF(match_sets[i]);
zend_hash_update(Z_ARRVAL_P(subpats), subpat_names[i], &wrapper);
GC_ADDREF(match_sets[i]);
}
zend_hash_next_index_insert_new(Z_ARRVAL_P(subpats), &match_sets[i]);
zend_hash_next_index_insert_new(Z_ARRVAL_P(subpats), &wrapper);
}
} else {
for (i = 0; i < num_subpats; i++) {
zend_hash_next_index_insert_new(Z_ARRVAL_P(subpats), &match_sets[i]);
zval wrapper;
ZVAL_ARR(&wrapper, match_sets[i]);
zend_hash_next_index_insert_new(Z_ARRVAL_P(subpats), &wrapper);
}
}
efree(match_sets);
Expand Down Expand Up @@ -2563,7 +2572,7 @@ PHPAPI void php_pcre_split_impl(pcre_cache_entry *pce, zend_string *subject_str,
if (offset_capture) {
/* Add (match, offset) pair to the return value */
add_offset_pair(
return_value, subject, last_match_offset, offsets[0],
Z_ARRVAL_P(return_value), subject, last_match_offset, offsets[0],
NULL, 0);
} else {
/* Add the piece to the return value */
Expand All @@ -2583,7 +2592,7 @@ PHPAPI void php_pcre_split_impl(pcre_cache_entry *pce, zend_string *subject_str,
if (!no_empty || offsets[2*i] != offsets[2*i+1]) {
if (offset_capture) {
add_offset_pair(
return_value, subject, offsets[2*i], offsets[2*i+1], NULL, 0);
Z_ARRVAL_P(return_value), subject, offsets[2*i], offsets[2*i+1], NULL, 0);
} else {
populate_match_value_str(&tmp, subject, offsets[2*i], offsets[2*i+1]);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &tmp);
Expand Down Expand Up @@ -2660,7 +2669,7 @@ PHPAPI void php_pcre_split_impl(pcre_cache_entry *pce, zend_string *subject_str,
if (!no_empty || start_offset < ZSTR_LEN(subject_str)) {
if (offset_capture) {
/* Add the last (match, offset) pair to the return value */
add_offset_pair(return_value, subject, start_offset, ZSTR_LEN(subject_str), NULL, 0);
add_offset_pair(Z_ARRVAL_P(return_value), subject, start_offset, ZSTR_LEN(subject_str), NULL, 0);
} else {
/* Add the last piece to the return value */
if (start_offset == 0) {
Expand Down