cvs: Zend(PHP_4_3) / zend_alloc.c

sesser Mon May 17 09:15:15 2004 EDT Modified files: (Branch: PHP_4_3) /Zend zend_alloc.c Log: MFH http://cvs.php.net/diff.php/Zend/zend_alloc.c?r1=1.105.4.4&r2=1.105.4.5&ty=u Index: Zend/zend_alloc.c diff -u Zend/zend_alloc.c:1.105.4.4 Zend/zend_alloc.c:1.105.4.5 --- Zend/zend_alloc.c:1.105.4.4 Thu Oct 16 22:29:09 2003 +++ Zend/zend_alloc.c Mon May 17 09:15:14 2004 @@ -155,6 +155,12 @@ AG(cache_stats)[CACHE_INDEX][0]++; } #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 p = (zend_mem_header *) ZEND_DO_MALLOC(sizeof(zend_mem_header) + MEM_HEADER_PADDING + SIZE + END_MAGIC_SIZE); } @@ -185,12 +191,6 @@ # endif memcpy((((char *) p) + sizeof(zend_mem_header) + MEM_HEADER_PADDING + size), &mem_block_end_magic, sizeof(long)); #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); @@ -319,6 +319,12 @@ CALCULATE_REAL_SIZE_AND_CACHE_INDEX(size); HANDLE_BLOCK_INTERRUPTIONS(); +#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 REMOVE_POINTER_FROM_LIST(p); p = (zend_mem_header *) ZEND_DO_REALLOC(p, sizeof(zend_mem_header)+MEM_HEADER_PADDING+SIZE+END_MAGIC_SIZE); if (!p) { @@ -341,12 +347,6 @@ p->magic = MEM_BLOCK_START_MAGIC; memcpy((((char *) p) + sizeof(zend_mem_header) + MEM_HEADER_PADDING + size), &mem_block_end_magic, sizeof(long)); #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;