diff options
| author | Andi Gutmans <andi@php.net> | 2002-06-24 17:47:46 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2002-06-24 17:47:46 +0000 |
| commit | 8fd5e70e2deaf2e0f34f7f698fb93fd7899685cb (patch) | |
| tree | 35fdf6e57004704bd88b4baff56a026f88e9d4cb /Zend/zend_alloc.c | |
| parent | 1ae6ee54589b57d56b7001b7fc848e847986e411 (diff) | |
| download | php-git-8fd5e70e2deaf2e0f34f7f698fb93fd7899685cb.tar.gz | |
- Fix crash bug and clean up a bit.
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 2074b665e2..f64d48799e 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -445,15 +445,15 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache TSRMLS_DC) #ifdef ZEND_MM if (clean_cache) { zend_mm_shutdown(&AG(mm_heap)); - return; } + return; #elif defined(ZEND_WIN32) && !ZEND_DEBUG if (clean_cache && AG(memory_heap)) { HeapDestroy(AG(memory_heap)); return; } #endif -#if ZEND_DEBUG || !defined(ZEND_MM) +#if ZEND_ENABLE_FAST_CACHE for (fci=0; fci<MAX_FAST_CACHE_TYPES; fci++) { fast_cache_list_entry = AG(fast_cache_list_head)[fci]; while (fast_cache_list_entry) { @@ -463,7 +463,8 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache TSRMLS_DC) } AG(fast_cache_list_head)[fci] = NULL; } - +#endif +#if !ZEND_DISABLE_MEMORY_CACHE if (1 || clean_cache) { zend_mem_header *ptr; @@ -479,7 +480,8 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache TSRMLS_DC) AG(cache_count)[i] = 0; } } - +#endif +#if ZEND_DEBUG || !defined(ZEND_MM) p = AG(head); t = AG(head); while (t) { @@ -565,12 +567,6 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache TSRMLS_DC) } while (0); -#if defined(ZEND_WIN32) && ZEND_DEBUG - if (clean_cache && AG(memory_heap)) { - HeapDestroy(AG(memory_heap)); - } -#endif - #endif #endif } |