summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@lerdorf.com>2016-03-22 08:04:53 -0700
committerAnatol Belski <ab@php.net>2016-03-23 12:23:35 +0100
commit06c2b318665238dca8d168dab3913d073564ef78 (patch)
tree9c73a7edfa664bd46f8b60142c73f7486b2c4c7c
parent75dd4a7a502c271cd2e69fe46b085614beb771b2 (diff)
downloadphp-git-06c2b318665238dca8d168dab3913d073564ef78.tar.gz
Disable huge pages in the Zend allocator by default
As per the discussion on internals, this is an expert feature that needs special system-level configuration and care.
-rw-r--r--Zend/zend_alloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 4cf1178c57..1876559317 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -201,7 +201,7 @@ typedef struct _zend_mm_huge_list zend_mm_huge_list;
#endif
#ifdef MAP_HUGETLB
-int zend_mm_use_huge_pages = 1;
+int zend_mm_use_huge_pages = 0;
#endif
/*
@@ -2654,8 +2654,8 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
#endif
#ifdef MAP_HUGETLB
tmp = getenv("USE_ZEND_ALLOC_HUGE_PAGES");
- if (tmp && !zend_atoi(tmp, 0)) {
- zend_mm_use_huge_pages = 0;
+ if (tmp && zend_atoi(tmp, 0)) {
+ zend_mm_use_huge_pages = 1;
}
#endif
ZEND_TSRMLS_CACHE_UPDATE();