Merge branch 'PHP-7.1'

* PHP-7.1:
  Disabled PHP call tracing by default (it makes significant overhead). This may be enabled again using envirionment variable USE_ZEND_DTRACE=1.
This commit is contained in:
Dmitry Stogov 2016-11-18 13:22:54 +03:00
commit 3cc6ac565f

View file

@ -693,9 +693,19 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) /
#if HAVE_DTRACE #if HAVE_DTRACE
/* build with dtrace support */ /* build with dtrace support */
{
char *tmp = getenv("USE_ZEND_DTRACE");
if (tmp && zend_atoi(tmp, 0)) {
zend_compile_file = dtrace_compile_file; zend_compile_file = dtrace_compile_file;
zend_execute_ex = dtrace_execute_ex; zend_execute_ex = dtrace_execute_ex;
zend_execute_internal = dtrace_execute_internal; zend_execute_internal = dtrace_execute_internal;
} else {
zend_compile_file = compile_file;
zend_execute_ex = execute_ex;
zend_execute_internal = NULL;
}
}
#else #else
zend_compile_file = compile_file; zend_compile_file = compile_file;
zend_execute_ex = execute_ex; zend_execute_ex = execute_ex;