diff options
author | Anatol Belski <ab@php.net> | 2017-03-04 10:39:13 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2017-03-04 10:39:13 +0100 |
commit | c6982995504b6e21e8a5ade29cfb16a55196dc43 (patch) | |
tree | a196886e83d43fa9ece21e127edde10e3ab57c3e /Zend/zend_API.c | |
parent | a07272e5b63b404ff7070637137e81634a886bd8 (diff) | |
download | php-git-c6982995504b6e21e8a5ade29cfb16a55196dc43.tar.gz |
Interned strings unification for TS/NTS
Hereby, interned strings are supported in thread safe PHP. The patch
implements two types of interned strings
- interning per process, strings are not freed till process end
- interning per request, strings are freed at request end
There is no runtime interning.
With Opcache, all the permanent iterned strings are copied into SHM on
startup, additional copying into SHM might happen on demand.
Diffstat (limited to 'Zend/zend_API.c')
-rw-r--r-- | Zend/zend_API.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index bbea611697..f48c774634 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2019,6 +2019,7 @@ ZEND_API zend_module_entry* zend_register_module_ex(zend_module_entry *module) / lcname = zend_string_alloc(name_len, 1); zend_str_tolower_copy(ZSTR_VAL(lcname), module->name, name_len); + lcname = zend_new_interned_string(lcname); if ((module_ptr = zend_hash_add_mem(&module_registry, lcname, module, sizeof(zend_module_entry))) == NULL) { zend_error(E_CORE_WARNING, "Module '%s' already loaded", module->name); zend_string_release(lcname); @@ -3816,6 +3817,9 @@ ZEND_API int zend_declare_class_constant(zend_class_entry *ce, const char *name, int ret; zend_string *key = zend_string_init(name, name_length, ce->type & ZEND_INTERNAL_CLASS); + if (ce->type == ZEND_INTERNAL_CLASS) { + key = zend_new_interned_string(key); + } ret = zend_declare_class_constant_ex(ce, key, value, ZEND_ACC_PUBLIC, NULL); zend_string_release(key); return ret; |