php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 22:22:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0'

Browse Source 
* PHP-7.0:
  if there's no JIT support, no RINIT is really needed
  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.
This commit is contained in:
Anatol Belski
2016-03-22 21:48:11 +01:00
parent 94812fa6cd 241ba9dcb1
commit 76d612129b
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Zend/zend_alloc.c
View File

@@ -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();

8
ext/pcre/php_pcre.c
View File

@@ -212,18 +212,18 @@ static PHP_MSHUTDOWN_FUNCTION(pcre)
}
/* }}} */
#ifdef PCRE_STUDY_JIT_COMPILE
/* {{{ PHP_RINIT_FUNCTION(pcre) */
static PHP_RINIT_FUNCTION(pcre)
{
#ifdef PCRE_STUDY_JIT_COMPILE
if (PCRE_G(jit)) {
jit_stack = pcre_jit_stack_alloc(PCRE_JIT_STACK_MIN_SIZE,PCRE_JIT_STACK_MAX_SIZE);
}
#endif
return SUCCESS;
}
/* }}} */
#endif
/* {{{ static pcre_clean_cache */
static int pcre_clean_cache(zval *data, void *arg)
@@ -2232,7 +2232,11 @@ zend_module_entry pcre_module_entry = {
pcre_functions,
PHP_MINIT(pcre),
PHP_MSHUTDOWN(pcre),
#ifdef PCRE_STUDY_JIT_COMPILE
PHP_RINIT(pcre),
#else
NULL
#endif
NULL,
PHP_MINFO(pcre),
PHP_PCRE_VERSION,