From 47e26cf9dbe9c9650f2d33280845b8794db03910 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 2 Jun 2016 17:55:48 +0200 Subject: fix known interned strings init with TS per request --- Zend/zend_string.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'Zend/zend_string.c') diff --git a/Zend/zend_string.c b/Zend/zend_string.c index 4866b64949..3da95bd674 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -42,22 +42,26 @@ static void _str_dtor(zval *zv) } #endif +/* Readonly, so assigned also per thread. */ +static const zend_string **known_interned_strings = NULL; +static uint32_t known_interned_strings_count = 0; + ZEND_API uint32_t zend_intern_known_strings(const char **strings, uint32_t count) { - uint32_t i, old_count = CG(known_strings_count); + uint32_t i, old_count = known_interned_strings_count; - CG(known_strings) = perealloc(CG(known_strings), sizeof(char*) * (old_count + count), 1); + known_interned_strings = perealloc(known_interned_strings, sizeof(char*) * (old_count + count), 1); for (i = 0; i < count; i++) { #ifndef ZTS zend_string *str = zend_string_init(strings[i], strlen(strings[i]), 1); - CG(known_strings)[CG(known_strings_count) + i] = + known_interned_strings[known_interned_strings_count + i] = zend_new_interned_string_int(str); #else - CG(known_strings)[CG(known_strings_count) + i] = + known_interned_strings[known_interned_strings_count + i] = zend_zts_interned_string_init(strings[i], strlen(strings[i])); #endif } - CG(known_strings_count) = old_count + count; + known_interned_strings_count = old_count + count; return old_count; } @@ -68,6 +72,12 @@ ZEND_KNOWN_STRINGS(_ZEND_STR_DSC) NULL }; +void zend_known_interned_strings_init(zend_string ***strings, uint32_t *count) +{ + *strings = known_interned_strings; + *count = known_interned_strings_count; +} + void zend_interned_strings_init(void) { #ifndef ZTS @@ -90,9 +100,8 @@ void zend_interned_strings_init(void) memset(CG(one_char_string), 0, sizeof(CG(one_char_string))); /* known strings */ - CG(known_strings) = NULL; - CG(known_strings_count) = 0; zend_intern_known_strings(known_strings, (sizeof(known_strings) / sizeof(known_strings[0])) - 1); + zend_known_interned_strings_init(&CG(known_strings), &CG(known_strings_count)); zend_new_interned_string = zend_new_interned_string_int; zend_interned_strings_snapshot = zend_interned_strings_snapshot_int; -- cgit v1.2.1