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

Wrap FPM checks in AC_CACHE_CHECK and fix CS (#14681)

Browse Source 
- This simplifies over-quoted arguments to AC_COMPILE_IFELSE
- Indentation and other CS fixes
- php_cv_* cache variables
- AC_DEFINE help texts syncs to make it more clear
- Fix -Wunused-but-set-variable warnings
This commit is contained in:
Peter Kokot
2024-06-27 21:30:35 +02:00
committed by GitHub
parent fd28bb0f51
commit c705dd8884
1 changed files with 86 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
sapi/fpm/config.m4
View File

@@ -314,111 +314,106 @@ AC_DEFUN([PHP_FPM_LQ],
])
AC_DEFUN([PHP_FPM_KQUEUE],
[
AC_MSG_CHECKING([for kqueue])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <sys/types.h>
#include <sys/event.h>
#include <sys/time.h>
]], [[
int kfd;
struct kevent k;
kfd = kqueue();
/* 0 -> STDIN_FILENO */
EV_SET(&k, 0, EVFILT_READ , EV_ADD | EV_CLEAR, 0, 0, NULL);
]])], [
AC_DEFINE([HAVE_KQUEUE], 1, [do we have kqueue?])
AC_MSG_RESULT([yes])
], [
AC_MSG_RESULT([no])
])
[AC_CACHE_CHECK([for kqueue],
[php_cv_have_kqueue],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([dnl
#include <sys/types.h>
#include <sys/event.h>
#include <sys/time.h>
], [dnl
int kfd;
struct kevent k;
kfd = kqueue();
/* 0 -> STDIN_FILENO */
EV_SET(&k, 0, EVFILT_READ , EV_ADD | EV_CLEAR, 0, 0, NULL);
(void)kfd;
])],
[php_cv_have_kqueue=yes],
[php_cv_have_kqueue=no])])
AS_VAR_IF([php_cv_have_kqueue], [yes],
[AC_DEFINE([HAVE_KQUEUE], [1],
[Define to 1 if system has a working 'kqueue' function.])])
])
AC_DEFUN([PHP_FPM_DEVPOLL],
[
AC_MSG_CHECKING([for /dev/poll])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h>
#include <sys/devpoll.h>
]], [[
int n, dp;
struct dvpoll dvp;
dp = 0;
dvp.dp_fds = NULL;
dvp.dp_nfds = 0;
dvp.dp_timeout = 0;
n = ioctl(dp, DP_POLL, &dvp)
]])], [
AC_DEFINE([HAVE_DEVPOLL], 1, [do we have /dev/poll?])
AC_MSG_RESULT([yes])
], [
AC_MSG_RESULT([no])
])
[AC_CACHE_CHECK([for /dev/poll],
[php_cv_have_devpoll],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([dnl
#include <stdio.h>
#include <sys/devpoll.h>
], [dnl
int n, dp;
struct dvpoll dvp;
dp = 0;
dvp.dp_fds = NULL;
dvp.dp_nfds = 0;
dvp.dp_timeout = 0;
n = ioctl(dp, DP_POLL, &dvp);
(void)n;
])],
[php_cv_have_devpoll=yes],
[php_cv_have_devpoll=no])])
AS_VAR_IF([php_cv_have_devpoll], [yes],
[AC_DEFINE([HAVE_DEVPOLL], [1],
[Define to 1 if system has a working '/dev/poll'.])])
])
AC_DEFUN([PHP_FPM_EPOLL],
[
AC_MSG_CHECKING([for epoll])
[AC_CACHE_CHECK([for epoll],
[php_cv_have_epoll],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/epoll.h>], [dnl
int epollfd;
struct epoll_event e;
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <sys/epoll.h>
]], [[
int epollfd;
struct epoll_event e;
epollfd = epoll_create(1);
if (epollfd < 0) {
return 1;
}
epollfd = epoll_create(1);
if (epollfd < 0) {
return 1;
}
e.events = EPOLLIN | EPOLLET;
e.data.fd = 0;
e.events = EPOLLIN | EPOLLET;
e.data.fd = 0;
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, 0, &e) == -1) {
return 1;
}
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, 0, &e) == -1) {
return 1;
}
e.events = 0;
if (epoll_wait(epollfd, &e, 1, 1) < 0) {
return 1;
}
]])], [
AC_DEFINE([HAVE_EPOLL], 1, [do we have epoll?])
AC_MSG_RESULT([yes])
], [
AC_MSG_RESULT([no])
])
e.events = 0;
if (epoll_wait(epollfd, &e, 1, 1) < 0) {
return 1;
}
])],
[php_cv_have_epoll=yes],
[php_cv_have_epoll=no])])
AS_VAR_IF([php_cv_have_epoll], [yes],
[AC_DEFINE([HAVE_EPOLL], [1], [Define to 1 if system has a working epoll.])])
])
AC_DEFUN([PHP_FPM_SELECT],
[
AC_MSG_CHECKING([for select])
[AC_CACHE_CHECK([for select],
[php_cv_have_select],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([dnl
/* According to POSIX.1-2001 */
#include <sys/select.h>
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
/* According to POSIX.1-2001 */
#include <sys/select.h>
/* According to earlier standards */
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
]], [[
fd_set fds;
struct timeval t;
t.tv_sec = 0;
t.tv_usec = 42;
FD_ZERO(&fds);
/* 0 -> STDIN_FILENO */
FD_SET(0, &fds);
select(FD_SETSIZE, &fds, NULL, NULL, &t);
]])], [
AC_DEFINE([HAVE_SELECT], 1, [do we have select?])
AC_MSG_RESULT([yes])
], [
AC_MSG_RESULT([no])
])
/* According to earlier standards */
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
], [dnl
fd_set fds;
struct timeval t;
t.tv_sec = 0;
t.tv_usec = 42;
FD_ZERO(&fds);
/* 0 -> STDIN_FILENO */
FD_SET(0, &fds);
select(FD_SETSIZE, &fds, NULL, NULL, &t);
])],
[php_cv_have_select=yes],
[php_cv_have_select=no])])
AS_VAR_IF([php_cv_have_select], [yes],
[AC_DEFINE([HAVE_SELECT], [1],
[Define to 1 if system has a working 'select' function.])])
])
AC_MSG_CHECKING(for FPM build)