Skip to content

Wrap FPM checks in AC_CACHE_CHECK and fix CS #14681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 27, 2024
Merged

Wrap FPM checks in AC_CACHE_CHECK and fix CS #14681

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbe2b72
Wrap FPM checks in AC_CACHE_CHECK and fix CS
petk Jun 26, 2024
259e8c7
Fix -Wunused-but-set-variable warnings
petk Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
187 changes: 91 additions & 96 deletions sapi/fpm/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <sys/epoll.h>
]], [[
int epollfd;
struct epoll_event e;

epollfd = epoll_create(1);
if (epollfd < 0) {
return 1;
}

e.events = EPOLLIN | EPOLLET;
e.data.fd = 0;

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])
])
[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;

epollfd = epoll_create(1);
if (epollfd < 0) {
return 1;
}

e.events = EPOLLIN | EPOLLET;
e.data.fd = 0;

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;
}
])],
[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_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])
])
[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>

/* 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)
Expand Down
Loading