diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-07-18 09:06:33 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-07-18 09:06:33 +0000 |
| commit | 29ed52ffa46529dc11d41a919f21b3e8ab32229e (patch) | |
| tree | abea71604780b607e44e47609fcae1cc17a4ae8b /Zend/zend.c | |
| parent | 7f9a43653c229193b2c181e20150ab108052cea7 (diff) | |
| download | php-git-29ed52ffa46529dc11d41a919f21b3e8ab32229e.tar.gz | |
New memory manager
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 86c9c57b88..b9558fe6ef 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -87,7 +87,6 @@ ZEND_INI_END() #ifdef ZTS ZEND_API int compiler_globals_id; ZEND_API int executor_globals_id; -ZEND_API int alloc_globals_id; HashTable *global_function_table; HashTable *global_class_table; HashTable *global_constants_table; @@ -525,19 +524,8 @@ static void zend_new_thread_end_handler(THREAD_T thread_id TSRMLS_DC) zend_copy_ini_directives(TSRMLS_C); zend_ini_refresh_caches(ZEND_INI_STAGE_STARTUP TSRMLS_CC); } - -static void alloc_globals_dtor(zend_alloc_globals *alloc_globals_p TSRMLS_DC) -{ - shutdown_memory_manager(1, 1 TSRMLS_CC); -} #endif -static void alloc_globals_ctor(zend_alloc_globals *alloc_globals_p TSRMLS_DC) -{ - start_memory_manager(TSRMLS_C); -} - - #if defined(__FreeBSD__) || defined(__DragonFly__) /* FreeBSD and DragonFly floating point precision fix */ #include <floatingpoint.h> @@ -574,11 +562,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i extern zend_scanner_globals language_scanner_globals; #endif -#ifdef ZTS - ts_allocate_id(&alloc_globals_id, sizeof(zend_alloc_globals), (ts_allocate_ctor) alloc_globals_ctor, (ts_allocate_dtor) alloc_globals_dtor); -#else - alloc_globals_ctor(&alloc_globals TSRMLS_CC); -#endif + start_memory_manager(TSRMLS_C); #if defined(__FreeBSD__) || defined(__DragonFly__) /* FreeBSD and DragonFly floating point precision fix */ |