diff options
| author | Andi Gutmans <andi@php.net> | 2002-06-24 07:22:25 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2002-06-24 07:22:25 +0000 |
| commit | 1c20bf27da7f61ba634f298617daaecee1db64a9 (patch) | |
| tree | ec02f126c5aaae8044c5459e034aaf52bd77359b | |
| parent | ba72dbf37a2a144cc22ddd854495054873cf005c (diff) | |
| download | php-git-1c20bf27da7f61ba634f298617daaecee1db64a9.tar.gz | |
- Don't keep allocated blocks in a linked list if we're in non-debug mode
- as now the memory manager takes care to nuke all leaking blocks.
| -rw-r--r-- | Zend/zend_alloc.c | 13 | ||||
| -rw-r--r-- | Zend/zend_alloc.h | 4 | ||||
| -rw-r--r-- | Zend/zend_mm.h | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 46831ef314..d2a322e431 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -172,7 +172,9 @@ ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) return (void *)p; } p->cached = 0; +#if ZEND_DEBUG || !defined(ZEND_MM) ADD_POINTER_TO_LIST(p); +#endif p->size = size; /* Save real size for correct cache output */ #if ZEND_DEBUG p->filename = __zend_filename; @@ -231,7 +233,9 @@ ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) return; } HANDLE_BLOCK_INTERRUPTIONS(); +#if ZEND_DEBUG || !defined(ZEND_MM) REMOVE_POINTER_FROM_LIST(p); +#endif #if MEMORY_LIMIT AG(allocated_memory) -= SIZE; @@ -288,7 +292,9 @@ ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LIN CALCULATE_REAL_SIZE_AND_CACHE_INDEX(size); HANDLE_BLOCK_INTERRUPTIONS(); +#if ZEND_DEBUG || !defined(ZEND_MM) REMOVE_POINTER_FROM_LIST(p); +#endif p = (zend_mem_header *) ZEND_DO_REALLOC(p, sizeof(zend_mem_header)+MEM_HEADER_PADDING+SIZE+END_MAGIC_SIZE); if (!p) { if (!allow_failure) { @@ -299,11 +305,15 @@ ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LIN exit(1); #endif } +#if ZEND_DEBUG || !defined(ZEND_MM) ADD_POINTER_TO_LIST(orig); +#endif HANDLE_UNBLOCK_INTERRUPTIONS(); return (void *)NULL; } +#if ZEND_DEBUG || !defined(ZEND_MM) ADD_POINTER_TO_LIST(p); +#endif #if ZEND_DEBUG p->filename = __zend_filename; p->lineno = __zend_lineno; @@ -461,7 +471,7 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache TSRMLS_DC) return; } #endif - +#if ZEND_DEBUG || !defined(ZEND_MM) for (fci=0; fci<MAX_FAST_CACHE_TYPES; fci++) { fast_cache_list_entry = AG(fast_cache_list_head)[fci]; while (fast_cache_list_entry) { @@ -580,6 +590,7 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache TSRMLS_DC) #endif #endif +#endif } diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h index 66b394bf76..c04ee1dee7 100644 --- a/Zend/zend_alloc.h +++ b/Zend/zend_alloc.h @@ -26,6 +26,8 @@ #include "../TSRM/TSRM.h" #include "zend_globals_macros.h" +#include "zend_mm.h" + #define MEM_BLOCK_START_MAGIC 0x7312F8DCL #define MEM_BLOCK_END_MAGIC 0x2A8FCC84L #define MEM_BLOCK_FREED_MAGIC 0x99954317L @@ -43,8 +45,10 @@ typedef struct _zend_mem_header { THREAD_T thread_id; # endif #endif +#if ZEND_DEBUG || !defined(ZEND_MM) struct _zend_mem_header *pNext; struct _zend_mem_header *pLast; +#endif unsigned int size:31; unsigned int cached:1; } zend_mem_header; diff --git a/Zend/zend_mm.h b/Zend/zend_mm.h index bd560a6c30..58286e55c2 100644 --- a/Zend/zend_mm.h +++ b/Zend/zend_mm.h @@ -22,7 +22,7 @@ #include <sys/types.h> -#include "zend.h" +#include "zend_types.h" /* Define this to enable Zend MM */ #undef ZEND_MM |