diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-04-22 11:59:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-04-22 11:59:53 +0800 |
| commit | 89d89b95861c4366f93e705546c0ca8c4443a425 (patch) | |
| tree | d59aaef97b53a61bc7c10de368dad7adcc34fef7 /Zend/zend_string.c | |
| parent | e48b9ad197b4ec6ac72e75538453cc350d0a41f4 (diff) | |
| parent | fa588a5c82c0264dc10862495c993a914a421667 (diff) | |
| download | php-git-89d89b95861c4366f93e705546c0ca8c4443a425.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'Zend/zend_string.c')
| -rw-r--r-- | Zend/zend_string.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_string.c b/Zend/zend_string.c index 730312009d..80571ec390 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -46,11 +46,11 @@ void zend_interned_strings_init(TSRMLS_D) zend_string *str; #ifndef ZTS - zend_hash_init(&CG(interned_strings), 0, NULL, _str_dtor, 1); + zend_hash_init(&CG(interned_strings), 1024, NULL, _str_dtor, 1); CG(interned_strings).nTableMask = CG(interned_strings).nTableSize - 1; - CG(interned_strings).arData = (Bucket*) pecalloc(CG(interned_strings).nTableSize, sizeof(Bucket), CG(interned_strings).flags & HASH_FLAG_PERSISTENT); - CG(interned_strings).arHash = (zend_uint*) pecalloc(CG(interned_strings).nTableSize, sizeof(zend_uint), CG(interned_strings).flags & HASH_FLAG_PERSISTENT); + CG(interned_strings).arData = (Bucket*) pecalloc(CG(interned_strings).nTableSize, sizeof(Bucket), 1); + CG(interned_strings).arHash = (zend_uint*) pecalloc(CG(interned_strings).nTableSize, sizeof(zend_uint), 1); memset(CG(interned_strings).arHash, INVALID_IDX, CG(interned_strings).nTableSize * sizeof(zend_uint)); /* interned empty string */ @@ -112,8 +112,8 @@ static zend_string *zend_new_interned_string_int(zend_string *str TSRMLS_DC) if (CG(interned_strings).nNumUsed >= CG(interned_strings).nTableSize) { if ((CG(interned_strings).nTableSize << 1) > 0) { /* Let's double the table size */ - Bucket *d = (Bucket *) perealloc_recoverable(CG(interned_strings).arData, (CG(interned_strings).nTableSize << 1) * sizeof(Bucket), CG(interned_strings).flags & HASH_FLAG_PERSISTENT); - zend_uint *h = (zend_uint *) perealloc_recoverable(CG(interned_strings).arHash, (CG(interned_strings).nTableSize << 1) * sizeof(zend_uint), CG(interned_strings).flags & HASH_FLAG_PERSISTENT); + Bucket *d = (Bucket *) perealloc_recoverable(CG(interned_strings).arData, (CG(interned_strings).nTableSize << 1) * sizeof(Bucket), 1); + zend_uint *h = (zend_uint *) perealloc_recoverable(CG(interned_strings).arHash, (CG(interned_strings).nTableSize << 1) * sizeof(zend_uint), 1); if (d && h) { HANDLE_BLOCK_INTERRUPTIONS(); |