diff options
| author | Dmitry Stogov <dmitry@php.net> | 2011-07-28 12:01:42 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2011-07-28 12:01:42 +0000 |
| commit | b32445d4f3ad5954db43761312be7a8f3fc58ca3 (patch) | |
| tree | f5e1a0517f1a4639dc14576018a68f89e5ec8bc8 /Zend/zend_string.c | |
| parent | 7cf389ad2c7a7300ab7b582341f56bf496c1a8fe (diff) | |
| download | php-git-b32445d4f3ad5954db43761312be7a8f3fc58ca3.tar.gz | |
Reverted Gopal's patch that allowed plugable interned string check
1. It introduced a significant slowdown
2. It didn't fix the real problem in APC (I'm goint to commit the fix)
Diffstat (limited to 'Zend/zend_string.c')
| -rw-r--r-- | Zend/zend_string.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Zend/zend_string.c b/Zend/zend_string.c index 77b165ab20..949c191582 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -30,12 +30,10 @@ #endif ZEND_API const char *(*zend_new_interned_string)(const char *str, int len, int free_src TSRMLS_DC); -ZEND_API zend_bool (*zend_is_interned_string)(const char *str TSRMLS_DC); ZEND_API void (*zend_interned_strings_snapshot)(TSRMLS_D); ZEND_API void (*zend_interned_strings_restore)(TSRMLS_D); static const char *zend_new_interned_string_int(const char *str, int len, int free_src TSRMLS_DC); -static zend_bool zend_is_interned_string_int(const char *str TSRMLS_DC); static void zend_interned_strings_snapshot_int(TSRMLS_D); static void zend_interned_strings_restore_int(TSRMLS_D); @@ -66,7 +64,6 @@ void zend_interned_strings_init(TSRMLS_D) #endif zend_new_interned_string = zend_new_interned_string_int; - zend_is_interned_string = zend_is_interned_string_int; zend_interned_strings_snapshot = zend_interned_strings_snapshot_int; zend_interned_strings_restore = zend_interned_strings_restore_int; } @@ -180,11 +177,6 @@ static const char *zend_new_interned_string_int(const char *arKey, int nKeyLengt #endif } -static zend_bool zend_is_interned_string_int(const char *s TSRMLS_DC) -{ - return (((s) >= CG(interned_strings_start)) && ((s) < CG(interned_strings_end))); -} - static void zend_interned_strings_snapshot_int(TSRMLS_D) { CG(interned_strings_snapshot_top) = CG(interned_strings_top); |