Skip to content

Commit 017d1df

Browse files
committed
Improve performance of urldecode() and rawurldecode()
There are two hot spots on my machines: 1. We copy the string because the internal PHP API works in-place. 2. The conversion of hex characters is slow due to going through the C locale handling. This patch resolves the first hot spots by introducing 2 new internal APIs that avoid the redundant copy and allocate an empty string upfront. The second hotspot is resolved by having a specialised htoi handler. For the following benchmark: ```php $encoded = "Hello%20World%21+This%20is%20a%20test%3A%20%40%23%24%25%5E%26*%28%29"; for ($i=0;$i<2000000;$i++) { rawurldecode($encoded); urldecode($encoded); } ``` On an i7-4790: ``` Benchmark 1: ./sapi/cli/php x.php Time (mean ± σ): 364.8 ms ± 3.7 ms [User: 359.9 ms, System: 3.3 ms] Range (min … max): 359.9 ms … 372.0 ms 10 runs Benchmark 2: ./sapi/cli/php_old x.php Time (mean ± σ): 565.5 ms ± 4.9 ms [User: 561.8 ms, System: 2.5 ms] Range (min … max): 560.7 ms … 578.2 ms 10 runs Summary ./sapi/cli/php x.php ran 1.55 ± 0.02 times faster than ./sapi/cli/php_old x.php ``` On an i7-1185G7: ``` Benchmark 1: ./sapi/cli/php x.php Time (mean ± σ): 708.8 ms ± 6.1 ms [User: 701.4 ms, System: 6.3 ms] Range (min … max): 701.9 ms … 722.3 ms 10 runs Benchmark 2: ./sapi/cli/php_old x.php Time (mean ± σ): 1.311 s ± 0.019 s [User: 1.300 s, System: 0.008 s] Range (min … max): 1.281 s … 1.348 s 10 runs Summary ./sapi/cli/php x.php ran 1.85 ± 0.03 times faster than ./sapi/cli/php_old x.php ```
1 parent 68d5403 commit 017d1df

File tree

3 files changed

+47
-28
lines changed

3 files changed

+47
-28
lines changed

UPGRADING.INTERNALS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ PHP 8.5 INTERNALS UPGRADE NOTES
6161
is still valid. This is useful when a GC cycle is collected and the
6262
database object can be destroyed prior to destroying the statement.
6363

64+
- ext/standard
65+
. Added php_url_decode_ex() and php_raw_url_decode_ex() that unlike their
66+
non-ex counterparts do not work in-place.
67+
6468
========================
6569
4. OpCode changes
6670
========================

ext/standard/url.c

Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -411,21 +411,24 @@ PHP_FUNCTION(parse_url)
411411
}
412412
/* }}} */
413413

414+
/* https://stackoverflow.com/questions/34365746/whats-the-fastest-way-to-convert-hex-to-integer-in-c */
415+
static unsigned int php_htoi_single(unsigned char x)
416+
{
417+
ZEND_ASSERT((x >= 'a' && x <= 'f') || (x >= 'A' && x <= 'F') || (x >= '0' && x <= '9'));
418+
return 9 * (x >> 6) + (x & 017);
419+
}
420+
414421
/* {{{ php_htoi */
415-
static int php_htoi(char *s)
422+
static int php_htoi(const char *s)
416423
{
417424
int value;
418-
int c;
425+
unsigned char c;
419426

420427
c = ((unsigned char *)s)[0];
421-
if (isupper(c))
422-
c = tolower(c);
423-
value = (c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10) * 16;
428+
value = php_htoi_single(c) * 16;
424429

425430
c = ((unsigned char *)s)[1];
426-
if (isupper(c))
427-
c = tolower(c);
428-
value += c >= '0' && c <= '9' ? c - '0' : c - 'a' + 10;
431+
value += php_htoi_single(c);
429432

430433
return (value);
431434
}
@@ -571,36 +574,41 @@ PHP_FUNCTION(urldecode)
571574
Z_PARAM_STR(in_str)
572575
ZEND_PARSE_PARAMETERS_END();
573576

574-
out_str = zend_string_init(ZSTR_VAL(in_str), ZSTR_LEN(in_str), 0);
575-
ZSTR_LEN(out_str) = php_url_decode(ZSTR_VAL(out_str), ZSTR_LEN(out_str));
577+
out_str = zend_string_alloc(ZSTR_LEN(in_str), false);
578+
ZSTR_LEN(out_str) = php_url_decode_ex(ZSTR_VAL(out_str), ZSTR_VAL(in_str), ZSTR_LEN(in_str));
576579

577580
RETURN_NEW_STR(out_str);
578581
}
579582
/* }}} */
580583

581-
/* {{{ php_url_decode */
582-
PHPAPI size_t php_url_decode(char *str, size_t len)
584+
PHPAPI size_t php_url_decode_ex(char *dest, const char *src, size_t src_len)
583585
{
584-
char *dest = str;
585-
char *data = str;
586+
char *dest_start = dest;
587+
const char *data = src;
586588

587-
while (len--) {
589+
while (src_len--) {
588590
if (*data == '+') {
589591
*dest = ' ';
590592
}
591-
else if (*data == '%' && len >= 2 && isxdigit((int) *(data + 1))
593+
else if (*data == '%' && src_len >= 2 && isxdigit((int) *(data + 1))
592594
&& isxdigit((int) *(data + 2))) {
593595
*dest = (char) php_htoi(data + 1);
594596
data += 2;
595-
len -= 2;
597+
src_len -= 2;
596598
} else {
597599
*dest = *data;
598600
}
599601
data++;
600602
dest++;
601603
}
602604
*dest = '\0';
603-
return dest - str;
605+
return dest - dest_start;
606+
}
607+
608+
/* {{{ php_url_decode */
609+
PHPAPI size_t php_url_decode(char *str, size_t len)
610+
{
611+
return php_url_decode_ex(str, str, len);
604612
}
605613
/* }}} */
606614

@@ -633,33 +641,38 @@ PHP_FUNCTION(rawurldecode)
633641
Z_PARAM_STR(in_str)
634642
ZEND_PARSE_PARAMETERS_END();
635643

636-
out_str = zend_string_init(ZSTR_VAL(in_str), ZSTR_LEN(in_str), 0);
637-
ZSTR_LEN(out_str) = php_raw_url_decode(ZSTR_VAL(out_str), ZSTR_LEN(out_str));
644+
out_str = zend_string_alloc(ZSTR_LEN(in_str), false);
645+
ZSTR_LEN(out_str) = php_raw_url_decode_ex(ZSTR_VAL(out_str), ZSTR_VAL(in_str), ZSTR_LEN(in_str));
638646

639647
RETURN_NEW_STR(out_str);
640648
}
641649
/* }}} */
642650

643-
/* {{{ php_raw_url_decode */
644-
PHPAPI size_t php_raw_url_decode(char *str, size_t len)
651+
PHPAPI size_t php_raw_url_decode_ex(char *dest, const char *src, size_t src_len)
645652
{
646-
char *dest = str;
647-
char *data = str;
653+
char *dest_start = dest;
654+
const char *data = src;
648655

649-
while (len--) {
650-
if (*data == '%' && len >= 2 && isxdigit((int) *(data + 1))
656+
while (src_len--) {
657+
if (*data == '%' && src_len >= 2 && isxdigit((int) *(data + 1))
651658
&& isxdigit((int) *(data + 2))) {
652659
*dest = (char) php_htoi(data + 1);
653660
data += 2;
654-
len -= 2;
661+
src_len -= 2;
655662
} else {
656663
*dest = *data;
657664
}
658665
data++;
659666
dest++;
660667
}
661668
*dest = '\0';
662-
return dest - str;
669+
return dest - dest_start;
670+
}
671+
672+
/* {{{ php_raw_url_decode */
673+
PHPAPI size_t php_raw_url_decode(char *str, size_t len)
674+
{
675+
return php_raw_url_decode_ex(str, str, len);
663676
}
664677
/* }}} */
665678

ext/standard/url.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ PHPAPI php_url *php_url_parse(char const *str);
3333
PHPAPI php_url *php_url_parse_ex(char const *str, size_t length);
3434
PHPAPI php_url *php_url_parse_ex2(char const *str, size_t length, bool *has_port);
3535
PHPAPI size_t php_url_decode(char *str, size_t len); /* return value: length of decoded string */
36+
PHPAPI size_t php_url_decode_ex(char *dest, const char *src, size_t src_len);
3637
PHPAPI size_t php_raw_url_decode(char *str, size_t len); /* return value: length of decoded string */
38+
PHPAPI size_t php_raw_url_decode_ex(char *dest, const char *src, size_t src_len);
3739
PHPAPI zend_string *php_url_encode(char const *s, size_t len);
3840
PHPAPI zend_string *php_raw_url_encode(char const *s, size_t len);
3941

0 commit comments

Comments
 (0)