Move/refactor heavily changed zend_alloc functions first

Author: mvorisek

Zend/zend_alloc.c

@@ -416,36 +416,22 @@ stderr_last_error(char *msg)
 /* OS Allocation */
 /*****************/
 
-#ifndef HAVE_MREMAP
-static void *zend_mm_mmap_fixed(void *addr, size_t size)
+static void zend_mm_munmap(void *addr, size_t size)
 {
 #ifdef _WIN32
-	return VirtualAlloc(addr, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
-#else
-	int flags = MAP_PRIVATE | MAP_ANON;
-#if defined(MAP_EXCL)
-	flags |= MAP_FIXED | MAP_EXCL;
-#endif
-	/* MAP_FIXED leads to discarding of the old mapping, so it can't be used. */
-	void *ptr = mmap(addr, size, PROT_READ | PROT_WRITE, flags /*| MAP_POPULATE | MAP_HUGETLB*/, ZEND_MM_FD, 0);
-
-	if (ptr == MAP_FAILED) {
-#if ZEND_MM_ERROR && !defined(MAP_EXCL)
-		fprintf(stderr, "\nmmap() failed: [%d] %s\n", errno, strerror(errno));
+	if (VirtualFree(addr, 0, MEM_RELEASE) == 0) {
+#if ZEND_MM_ERROR
+		stderr_last_error("VirtualFree() failed");
 #endif
-		return NULL;
-	} else if (ptr != addr) {
-		if (munmap(ptr, size) != 0) {
+	}
+#else
+	if (munmap(addr, size) != 0) {
 #if ZEND_MM_ERROR
-			fprintf(stderr, "\nmunmap() failed: [%d] %s\n", errno, strerror(errno));
+		fprintf(stderr, "\nmunmap() failed: [%d] %s\n", errno, strerror(errno));
 #endif
-		}
-		return NULL;
 	}
-	return ptr;
 #endif
 }
-#endif
 
 static void *zend_mm_mmap(size_t size)
 {
@@ -483,22 +469,32 @@ static void *zend_mm_mmap(size_t size)
 #endif
 }
 
-static void zend_mm_munmap(void *addr, size_t size)
+#ifndef HAVE_MREMAP
+static void *zend_mm_mmap_fixed(void *addr, size_t size)
 {
 #ifdef _WIN32
-	if (VirtualFree(addr, 0, MEM_RELEASE) == 0) {
-#if ZEND_MM_ERROR
-		stderr_last_error("VirtualFree() failed");
-#endif
-	}
+	return VirtualAlloc(addr, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
 #else
-	if (munmap(addr, size) != 0) {
-#if ZEND_MM_ERROR
-		fprintf(stderr, "\nmunmap() failed: [%d] %s\n", errno, strerror(errno));
+	int flags = MAP_PRIVATE | MAP_ANON;
+#if defined(MAP_EXCL)
+	flags |= MAP_FIXED | MAP_EXCL;
+#endif
+	/* MAP_FIXED leads to discarding of the old mapping, so it can't be used. */
+	void *ptr = mmap(addr, size, PROT_READ | PROT_WRITE, flags /*| MAP_POPULATE | MAP_HUGETLB*/, ZEND_MM_FD, 0);
+
+	if (ptr == MAP_FAILED) {
+#if ZEND_MM_ERROR && !defined(MAP_EXCL)
+		fprintf(stderr, "\nmmap() failed: [%d] %s\n", errno, strerror(errno));
 #endif
+		return NULL;
+	} else if (ptr != addr) {
+		zend_mm_munmap(ptr, size);
+		return NULL;
 	}
+	return ptr;
 #endif
 }
+#endif
 
 /***********/
 /* Bitmask */
@@ -668,14 +664,7 @@ static void *zend_mm_chunk_alloc_int(size_t size, size_t alignment)
 
 	if (ptr == NULL) {
 		return NULL;
-	} else if (ZEND_MM_ALIGNED_OFFSET(ptr, alignment) == 0) {
-#ifdef MADV_HUGEPAGE
-		if (zend_mm_use_huge_pages) {
-			madvise(ptr, size, MADV_HUGEPAGE);
-		}
-#endif
-		return ptr;
-	} else {
+	} else if (ZEND_MM_ALIGNED_OFFSET(ptr, alignment) != 0) {
 		size_t offset;
 
 		/* chunk has to be aligned */
@@ -702,14 +691,16 @@ static void *zend_mm_chunk_alloc_int(size_t size, size_t alignment)
 		if (alignment > REAL_PAGE_SIZE) {
 			zend_mm_munmap((char*)ptr + size, alignment - REAL_PAGE_SIZE);
 		}
-# ifdef MADV_HUGEPAGE
-		if (zend_mm_use_huge_pages) {
-			madvise(ptr, size, MADV_HUGEPAGE);
-		}
-# endif
 #endif
-		return ptr;
 	}
+
+#ifdef MADV_HUGEPAGE
+	if (zend_mm_use_huge_pages) {
+		madvise(ptr, size, MADV_HUGEPAGE);
+	}
+#endif
+
+	return ptr;
 }
 
 static void *zend_mm_chunk_alloc(zend_mm_heap *heap, size_t size, size_t alignment)