diff options
| author | Zeev Suraski <zeev@php.net> | 1999-12-26 23:20:18 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-12-26 23:20:18 +0000 |
| commit | 3c50b7ee456edfea6d6227c7333578a680c2ac85 (patch) | |
| tree | 650edf921d22760ee7815c8526409f402637c0f4 /Zend/zend_alloc.c | |
| parent | b90bc0b15c87c1651689f191c7e9101508aacfe7 (diff) | |
| download | php-git-3c50b7ee456edfea6d6227c7333578a680c2ac85.tar.gz | |
- Enable the new zval cache on debug too. No real reason not to, and it keeps
the code cleaner.
- ZTS compile fixes
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index b100526e96..55a2dec123 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -315,6 +315,7 @@ ZEND_API int zend_set_memory_limit(unsigned int memory_limit) ZEND_API void start_memory_manager(ALS_D) { AG(phead) = AG(head) = NULL; + AG(zval_list_head) = NULL; #if MEMORY_LIMIT AG(memory_limit)=1<<30; /* rediculous limit, effectively no limit */ @@ -322,9 +323,6 @@ ZEND_API void start_memory_manager(ALS_D) AG(memory_exhausted)=0; #endif -#if !ZEND_DEBUG - AG(zval_list_head) = NULL; -#endif memset(AG(cache_count),0,MAX_CACHED_MEMORY*sizeof(unsigned char)); } @@ -335,12 +333,10 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache) zend_mem_header *p, *t; #if ZEND_DEBUG int had_leaks=0; -#else - zend_zval_list_entry *zval_list_entry, *next_zval_list_entry; #endif + zend_zval_list_entry *zval_list_entry, *next_zval_list_entry; ALS_FETCH(); -#if !ZEND_DEBUG zval_list_entry = AG(zval_list_head); while (zval_list_entry) { next_zval_list_entry = zval_list_entry->next; @@ -348,7 +344,6 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache) zval_list_entry = next_zval_list_entry; } AG(zval_list_head) = NULL; -#endif p=AG(head); t=AG(head); |