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

Autotools: Refactor PHP-FPM /proc/pid filename check (#14949)

Browse Source 
- Check wrapped in AC_CACHE_CHECK using php_cv_file_proc_mem variable
- CS synced
This commit is contained in:
Peter Kokot
2024-07-14 17:20:41 +02:00
committed by GitHub
parent 0e2e8e0f13
commit 0051b73a3e
1 changed files with 24 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
sapi/fpm/config.m4
View File

@@ -147,20 +147,13 @@ AS_VAR_IF([php_cv_func_mach_vm_read], [yes],
[AC_DEFINE([HAVE_MACH_VM_READ], [1],
[Define to 1 if you have the 'mach_vm_read' function.])])
proc_mem_file=""
AC_CACHE_CHECK([for proc mem file], [php_cv_file_proc_mem],
[AS_IF([test -r /proc/$$/mem], [proc_mem_file=mem],
[test -r /proc/$$/as], [proc_mem_file=as],
[proc_mem_file=])
if test -r /proc/$$/mem ; then
proc_mem_file="mem"
else
if test -r /proc/$$/as ; then
proc_mem_file="as"
fi
fi
if test -n "$proc_mem_file" ; then
AC_MSG_CHECKING([for proc mem file])
AC_RUN_IFELSE([AC_LANG_SOURCE([[
AS_VAR_IF([proc_mem_file],,,
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
@@ -188,35 +181,24 @@ AS_VAR_IF([php_cv_func_mach_vm_read], [yes],
close(fd);
return v1 != v2;
}
]])], [
AC_MSG_RESULT([$proc_mem_file])
], [
proc_mem_file=""
AC_MSG_RESULT([no])
], [
AC_MSG_RESULT([skipped (cross-compiling)])
])
fi
]])],
[php_cv_file_proc_mem=$proc_mem_file],
[php_cv_file_proc_mem=],
[php_cv_file_proc_mem=$proc_mem_file])
])
])
if test -n "$proc_mem_file"; then
AC_DEFINE_UNQUOTED([PROC_MEM_FILE], "$proc_mem_file", [/proc/pid/mem interface])
fi
AS_VAR_IF([php_cv_file_proc_mem],,,
[AC_DEFINE_UNQUOTED([PROC_MEM_FILE], ["$php_cv_file_proc_mem"],
[Define to the /proc/pid/mem interface filename value.])])
fpm_trace_type=""
if test "$php_cv_func_ptrace" = "yes"; then
fpm_trace_type=ptrace
elif test -n "$proc_mem_file"; then
fpm_trace_type=pread
elif test "$php_cv_func_mach_vm_read" = "yes" ; then
fpm_trace_type=mach
else
AC_MSG_WARN([FPM Trace - ptrace, pread, or mach: could not be found])
fi
AS_IF([test "x$php_cv_func_ptrace" = xyes], [fpm_trace_type=ptrace],
[test -n "$php_cv_file_proc_mem"], [fpm_trace_type=pread],
[test "x$php_cv_func_mach_vm_read" = xyes], [fpm_trace_type=mach],
[fpm_trace_type=])
AS_VAR_IF([fpm_trace_type],,
[AC_MSG_WARN([FPM Trace - ptrace, pread, or mach: could not be found])])
])
AC_DEFUN([PHP_FPM_BUILTIN_ATOMIC],
@@ -549,9 +531,9 @@ if test "$PHP_FPM" != "no"; then
SAPI_FPM_PATH=sapi/fpm/php-fpm
if test "$fpm_trace_type" && test -f "$abs_srcdir/sapi/fpm/fpm/fpm_trace_$fpm_trace_type.c"; then
PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c"
fi
AS_VAR_IF([fpm_trace_type],,,
[AS_IF([test -f "$abs_srcdir/sapi/fpm/fpm/fpm_trace_$fpm_trace_type.c"],
[PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c"])])
PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"