From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 2 Sep 2015 12:55:41 +0000 (+0300)
Subject: Use regular huge pages instead of anonymous if available.
X-Git-Tag: php-7.0.0RC2~2^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6848cb3f6301db11e1925f4457c0b58c2d169ccf;p=php

Use regular huge pages instead of anonymous if available.
---

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index ced3a77d70..9e7f5d194b 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -459,7 +459,18 @@ static void *zend_mm_mmap(size_t size)
 	}
 	return ptr;
 #else
-	void *ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON /*| MAP_POPULATE | MAP_HUGETLB*/, -1, 0);
+	void *ptr;
+
+#ifdef MAP_HUGETLB
+	if (size == ZEND_MM_CHUNK_SIZE) {
+		ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON | MAP_HUGETLB, -1, 0);
+		if (ptr != MAP_FAILED) {
+			return ptr;
+		}
+	}
+#endif
+
+	ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
 
 	if (ptr == MAP_FAILED) {
 #if ZEND_MM_ERROR