Skip to content

Commit 33ae764

Browse files
ndosschendossche
committed
Use zend_string for arg_separators
This allows us to avoid a call to `zend_ini_str` which took 6% of the profile on my i7-4790 for a call to `http_build_query`. Now we can just grab the value from the globals. In other files this can avoid some length recomputations.
1 parent ed30969 commit 33ae764

File tree

9 files changed

+21
-17
lines changed

9 files changed

+21
-17
lines changed

‎UPGRADING.INTERNALS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ PHP 8.5 INTERNALS UPGRADE NOTES
1414
1. Internal API changes
1515
========================
1616

17+
- Core
18+
. PG(arg_separator).input and PG(arg_separator).output are now `zend_string*`
19+
instead of `char*`.
20+
1721
- Zend
1822
. Added zend_safe_assign_to_variable_noref() function to safely assign
1923
a value to a non-reference zval.

‎ext/mbstring/mb_gpc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data)
100100
case PARSE_POST:
101101
case PARSE_GET:
102102
case PARSE_STRING:
103-
separator = (char *) estrdup(PG(arg_separator).input);
103+
separator = (char *) estrndup(ZSTR_VAL(PG(arg_separator).input), ZSTR_LEN(PG(arg_separator).input));
104104
break;
105105
case PARSE_COOKIE:
106106
separator = ";\0";

‎ext/mbstring/mbstring.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1537,7 +1537,7 @@ PHP_FUNCTION(mb_parse_str)
15371537
encstr = estrndup(encstr, encstr_len);
15381538

15391539
info.data_type = PARSE_STRING;
1540-
info.separator = PG(arg_separator).input;
1540+
info.separator = ZSTR_VAL(PG(arg_separator).input);
15411541
info.report_errors = true;
15421542
info.to_encoding = MBSTRG(current_internal_encoding);
15431543
info.from_encodings = MBSTRG(http_input_list);

‎ext/standard/http.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ PHPAPI void php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
124124
}
125125

126126
if (!arg_sep) {
127-
arg_sep = zend_ini_str("arg_separator.output", strlen("arg_separator.output"), false);
127+
arg_sep = PG(arg_separator).output;
128128
if (ZSTR_LEN(arg_sep) == 0) {
129129
arg_sep = ZSTR_CHAR('&');
130130
}

‎ext/standard/url_scanner_ex.re‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ alphadash = ([a-zA-Z] | "-");
188188
#define YYLIMIT q
189189
#define YYMARKER r
190190

191-
static inline void append_modified_url(smart_str *url, smart_str *dest, smart_str *url_app, const char *separator, int type)
191+
static inline void append_modified_url(smart_str *url, smart_str *dest, smart_str *url_app, const zend_string *separator, int type)
192192
{
193193
php_url *url_parts;
194194

@@ -271,7 +271,7 @@ static inline void append_modified_url(smart_str *url, smart_str *dest, smart_st
271271
smart_str_appendc(dest, '?');
272272
if (url_parts->query) {
273273
smart_str_appends(dest, ZSTR_VAL(url_parts->query));
274-
smart_str_appends(dest, separator);
274+
smart_str_append(dest, separator);
275275
smart_str_append_smart_str(dest, url_app);
276276
} else {
277277
smart_str_append_smart_str(dest, url_app);
@@ -757,7 +757,7 @@ static inline void php_url_scanner_add_var_impl(const char *name, size_t name_le
757757
}
758758

759759
if (url_state->url_app.s && ZSTR_LEN(url_state->url_app.s) != 0) {
760-
smart_str_appends(&url_state->url_app, PG(arg_separator).output);
760+
smart_str_append(&url_state->url_app, PG(arg_separator).output);
761761
}
762762

763763
if (encode) {
@@ -902,9 +902,9 @@ static inline zend_result php_url_scanner_reset_var_impl(zend_string *name, int
902902
/* Get end of url var */
903903
limit = ZSTR_VAL(url_state->url_app.s) + ZSTR_LEN(url_state->url_app.s);
904904
end = start + ZSTR_LEN(url_app.s);
905-
separator_len = strlen(PG(arg_separator).output);
905+
separator_len = ZSTR_LEN(PG(arg_separator).output);
906906
while (end < limit) {
907-
if (!memcmp(end, PG(arg_separator).output, separator_len)) {
907+
if (!memcmp(end, ZSTR_VAL(PG(arg_separator).output), separator_len)) {
908908
end += separator_len;
909909
sep_removed = 1;
910910
break;
@@ -918,8 +918,8 @@ static inline zend_result php_url_scanner_reset_var_impl(zend_string *name, int
918918
}
919919
/* Check preceding separator */
920920
if (!sep_removed
921-
&& (size_t)(start - PG(arg_separator).output) >= separator_len
922-
&& !memcmp(start - separator_len, PG(arg_separator).output, separator_len)) {
921+
&& (size_t)(start - ZSTR_VAL(PG(arg_separator).output)) >= separator_len
922+
&& !memcmp(start - separator_len, ZSTR_VAL(PG(arg_separator).output), separator_len)) {
923923
start -= separator_len;
924924
}
925925
/* Remove partially */

‎main/main.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -771,8 +771,8 @@ PHP_INI_BEGIN()
771771

772772
STD_PHP_INI_ENTRY("unserialize_callback_func", NULL, PHP_INI_ALL, OnUpdateString, unserialize_callback_func, php_core_globals, core_globals)
773773
STD_PHP_INI_ENTRY("serialize_precision", "-1", PHP_INI_ALL, OnSetSerializePrecision, serialize_precision, php_core_globals, core_globals)
774-
STD_PHP_INI_ENTRY("arg_separator.output", "&", PHP_INI_ALL, OnUpdateStringUnempty, arg_separator.output, php_core_globals, core_globals)
775-
STD_PHP_INI_ENTRY("arg_separator.input", "&", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateStringUnempty, arg_separator.input, php_core_globals, core_globals)
774+
STD_PHP_INI_ENTRY("arg_separator.output", "&", PHP_INI_ALL, OnUpdateStrNotEmpty, arg_separator.output, php_core_globals, core_globals)
775+
STD_PHP_INI_ENTRY("arg_separator.input", "&", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateStrNotEmpty, arg_separator.input, php_core_globals, core_globals)
776776

777777
STD_PHP_INI_ENTRY("auto_append_file", NULL, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateString, auto_append_file, php_core_globals, core_globals)
778778
STD_PHP_INI_ENTRY("auto_prepend_file", NULL, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateString, auto_prepend_file, php_core_globals, core_globals)

‎main/php_globals.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ extern ZEND_API struct _php_core_globals core_globals;
4848
struct _php_tick_function_entry;
4949

5050
typedef struct _arg_separators {
51-
char *output;
52-
char *input;
51+
zend_string *output;
52+
zend_string *input;
5353
} arg_separators;
5454

5555
struct _php_core_globals {

‎main/php_variables.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data)
527527
switch (arg) {
528528
case PARSE_GET:
529529
case PARSE_STRING:
530-
separator = PG(arg_separator).input;
530+
separator = ZSTR_VAL(PG(arg_separator).input);
531531
break;
532532
case PARSE_COOKIE:
533533
separator = ";\0";

‎sapi/cgi/cgi_main.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2420,7 +2420,7 @@ consult the installation file that came with this distribution, or visit \n\
24202420
* test.php v1=test "v2=hello world!"
24212421
*/
24222422
if (!SG(request_info).query_string && argc > php_optind) {
2423-
size_t slen = strlen(PG(arg_separator).input);
2423+
size_t slen = ZSTR_LEN(PG(arg_separator).input);
24242424
len = 0;
24252425
for (i = php_optind; i < argc; i++) {
24262426
if (i < (argc - 1)) {
@@ -2436,7 +2436,7 @@ consult the installation file that came with this distribution, or visit \n\
24362436
for (i = php_optind; i < argc; i++) {
24372437
strlcat(s, argv[i], len);
24382438
if (i < (argc - 1)) {
2439-
strlcat(s, PG(arg_separator).input, len);
2439+
strlcat(s, ZSTR_VAL(PG(arg_separator).input), len);
24402440
}
24412441
}
24422442
SG(request_info).query_string = s;

0 commit comments

Comments
 (0)