- Bad merge. Revert the previous patch (damn CVS).

Andi Gutmans · Andi Gutmans · commit 8ef5510aa9a0 · 2001-06-19T18:03:21.000Z
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -184,11 +184,7 @@ 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);
-	if (AG(allocated_memory) > AG(allocated_memory_peak)) {
-		AG(allocated_memory_peak) = AG(allocated_memory);
-	}
 #endif
-
 	HANDLE_UNBLOCK_INTERRUPTIONS();
 	return (void *)((char *)p + sizeof(zend_mem_header) + MEM_HEADER_PADDING);
 }
@@ -308,11 +304,7 @@ 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));
-	if (AG(allocated_memory) > AG(allocated_memory_peak)) {
-		AG(allocated_memory_peak) = AG(allocated_memory);
-	}
 #endif
-
 	p->size = size;
 
 	HANDLE_UNBLOCK_INTERRUPTIONS();
@@ -397,7 +389,6 @@ 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;
-	AG(allocated_memory_peak) = 0;
 #endif
 
 	memset(AG(fast_cache_list_head), 0, sizeof(AG(fast_cache_list_head)));
@@ -496,10 +487,8 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache)
 	}
 #if MEMORY_LIMIT
 	AG(memory_exhausted)=0;
-	AG(allocated_memory_peak) = 0;
 #endif
 
-
 #if (ZEND_DEBUG)
 	do {
 		zval display_memory_cache_stats;
