diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-03-17 22:43:42 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-03-17 22:43:42 +0300 |
| commit | 945a661912612cdecd221cd126feda7d4335c33c (patch) | |
| tree | f1bb57b44a6bc08ceff32c2a9dd91732ecb647e9 /Zend/zend_alloc.c | |
| parent | 28b6f0232b2e6a298f5a71e523718f0c85e7a7f2 (diff) | |
| download | php-git-945a661912612cdecd221cd126feda7d4335c33c.tar.gz | |
Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 6f0542e169..4cf1178c57 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -200,6 +200,10 @@ typedef struct _zend_mm_huge_list zend_mm_huge_list; # define PTR_FMT "0x%0.8lx" #endif +#ifdef MAP_HUGETLB +int zend_mm_use_huge_pages = 1; +#endif + /* * Memory is retrived from OS by chunks of fixed size 2MB. * Inside chunk it's managed by pages of fixed size 4096B. @@ -462,7 +466,7 @@ static void *zend_mm_mmap(size_t size) void *ptr; #ifdef MAP_HUGETLB - if (size == ZEND_MM_CHUNK_SIZE) { + if (zend_mm_use_huge_pages && 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; @@ -2648,6 +2652,12 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals) return; } #endif +#ifdef MAP_HUGETLB + tmp = getenv("USE_ZEND_ALLOC_HUGE_PAGES"); + if (tmp && !zend_atoi(tmp, 0)) { + zend_mm_use_huge_pages = 0; + } +#endif ZEND_TSRMLS_CACHE_UPDATE(); alloc_globals->mm_heap = zend_mm_init(); } |