Skip to content

sapi/fpm: retiring solaris /dev/poll support proposal. #14685

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

Closed
wants to merge 1 commit into from
Closed

sapi/fpm: retiring solaris /dev/poll support proposal. #14685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 0 additions & 24 deletions sapi/fpm/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,29 +335,6 @@ AS_VAR_IF([php_cv_have_kqueue], [yes],
[Define to 1 if system has a working 'kqueue' function.])])
])

AC_DEFUN([PHP_FPM_DEVPOLL],
[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_CACHE_CHECK([for epoll],
[php_cv_have_epoll],
Expand Down Expand Up @@ -619,7 +596,6 @@ if test "$PHP_FPM" != "no"; then
fpm/events/poll.c \
fpm/events/epoll.c \
fpm/events/kqueue.c \
fpm/events/devpoll.c \
fpm/events/port.c \
"

Expand Down
242 changes: 0 additions & 242 deletions sapi/fpm/fpm/events/devpoll.c
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions sapi/fpm/fpm/events/devpoll.h
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions sapi/fpm/fpm/fpm_events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include "events/select.h"
#include "events/poll.h"
#include "events/epoll.h"
#include "events/devpoll.h"
#include "events/port.h"
#include "events/kqueue.h"

Expand Down Expand Up @@ -279,14 +278,6 @@ int fpm_event_pre_init(char *mechanism) /* {{{ */
}
}

/* /dev/poll */
module = fpm_event_devpoll_module();
if (module) {
if (!mechanism || strcasecmp(module->name, mechanism) == 0) {
return 0;
}
}

/* poll */
module = fpm_event_poll_module();
if (module) {
Expand Down
1 change: 0 additions & 1 deletion sapi/fpm/php-fpm.conf.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@
; - poll (any POSIX os)
; - epoll (linux >= 2.5.44)
; - kqueue (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0)
; - /dev/poll (Solaris >= 7)
; - port (Solaris >= 10)
; Default Value: not set (auto detection)
;events.mechanism = epoll
Expand Down
Loading