diff options
| author | Zeev Suraski <zeev@php.net> | 2001-05-16 15:02:30 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-05-16 15:02:30 +0000 |
| commit | 260b4d0dbf7ab775be6dff25b977e206fbd66b8f (patch) | |
| tree | c255b91c81a034dc9625562a7901581a69590c7d /Zend/zend_alloc.c | |
| parent | 28a441fe02162916496279f62376aebd329c3b32 (diff) | |
| download | php-git-260b4d0dbf7ab775be6dff25b977e206fbd66b8f.tar.gz | |
Merge memory usage into memory limit
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 7a70333ea9..488a2c0ec4 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -184,11 +184,9 @@ ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) #endif #if MEMORY_LIMIT CHECK_MEMORY_LIMIT(size, SIZE); -#endif -#if MEMORY_USAGE_INFO - AG(cur_allocated_memory) += SIZE; - if (AG(cur_allocated_memory) > AG(max_allocated_memory)) - AG(max_allocated_memory) = AG(cur_allocated_memory); + if (AG(allocated_memory) > AG(allocated_memory_peak) { + AG(allocated_memory_peak) = AG(allocated_memory); + } #endif HANDLE_UNBLOCK_INTERRUPTIONS(); @@ -234,9 +232,6 @@ ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) #if MEMORY_LIMIT AG(allocated_memory) -= SIZE; #endif -#if MEMORY_USAGE_INFO - AG(cur_allocated_memory) -= SIZE; -#endif free(p); HANDLE_UNBLOCK_INTERRUPTIONS(); @@ -313,11 +308,8 @@ ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LIN #endif #if MEMORY_LIMIT CHECK_MEMORY_LIMIT(size - p->size, SIZE - REAL_SIZE(p->size)); -#endif -#if MEMORY_USAGE_INFO - AG(cur_allocated_memory) += SIZE - REAL_SIZE(p->size); - if (AG(cur_allocated_memory) > AG(max_allocated_memory)) - AG(max_allocated_memory) = AG(cur_allocated_memory); + if (AG(allocated_memory) > AG(allocated_memory_peak)) { + AG(allocated_memory_peak) = AG(allocated_memory); #endif p->size = size; @@ -404,10 +396,7 @@ ZEND_API void start_memory_manager(ALS_D) AG(memory_limit) = 1<<30; /* rediculous limit, effectively no limit */ AG(allocated_memory) = 0; AG(memory_exhausted) = 0; -#endif -#if MEMORY_USAGE_INFO - AG(cur_allocated_memory) = 0; - AG(max_allocated_memory) = 0; + AG(allocated_memory_peak) = 0; #endif memset(AG(fast_cache_list_head), 0, sizeof(AG(fast_cache_list_head))); @@ -507,10 +496,7 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache) #if MEMORY_LIMIT AG(memory_exhausted)=0; #endif -#if MEMORY_USAGE_INFO - AG(cur_allocated_memory) = 0; - AG(max_allocated_memory) = 0; -#endif + #if (ZEND_DEBUG) do { |