com php-src: Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PA GES=0.: NEWS
Zend/zend_alloc.c

From: Date: Thu, 17 Mar 2016 19:43:42 +0000
Subject: com php-src: Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PA GES=0.: NEWS
Zend/zend_alloc.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-91408@lists.php.net to get a copy of this message
Commit: 945a661912612cdecd221cd126feda7d4335c33c Author: Dmitry Stogov <dmitry@zend.com> Thu, 17 Mar 2016 22:43:42 +0300 Parents: 28b6f0232b2e6a298f5a71e523718f0c85e7a7f2 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=945a661912612cdecd221cd126feda7d4335c33c Log: Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0. Changed paths: M NEWS M Zend/zend_alloc.c Diff: diff --git a/NEWS b/NEWS index 4ce40fb..e832595 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ PHP NEWS ?? ??? 2016 PHP 7.0.6 - Core: + . Added ability to disable huge pages in Zend Memeory Manager through + the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0. (Dmitry) . Fixed bug #71841 (EG(error_zval) is not handled well).. (Laruence) - ODBC: diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 6f0542e..4cf1178 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(); }

« previous php.cvs (#91408) next »