Skip to content

Commit a8cbcae

Browse files
committed
sapi/fpm: retiring solaris /dev/poll support proposal.
Since Solaris 10, the port API is supported, is more modern, less bug prone and offers, on average, better performances.
1 parent c97885b commit a8cbcae

File tree

5 files changed

+0
-301
lines changed

5 files changed

+0
-301
lines changed

sapi/fpm/config.m4

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -335,29 +335,6 @@ AS_VAR_IF([php_cv_have_kqueue], [yes],
335335
[Define to 1 if system has a working 'kqueue' function.])])
336336
])
337337

338-
AC_DEFUN([PHP_FPM_DEVPOLL],
339-
[AC_CACHE_CHECK([for /dev/poll],
340-
[php_cv_have_devpoll],
341-
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([dnl
342-
#include <stdio.h>
343-
#include <sys/devpoll.h>
344-
], [dnl
345-
int n, dp;
346-
struct dvpoll dvp;
347-
dp = 0;
348-
dvp.dp_fds = NULL;
349-
dvp.dp_nfds = 0;
350-
dvp.dp_timeout = 0;
351-
n = ioctl(dp, DP_POLL, &dvp);
352-
(void)n;
353-
])],
354-
[php_cv_have_devpoll=yes],
355-
[php_cv_have_devpoll=no])])
356-
AS_VAR_IF([php_cv_have_devpoll], [yes],
357-
[AC_DEFINE([HAVE_DEVPOLL], [1],
358-
[Define to 1 if system has a working '/dev/poll'.])])
359-
])
360-
361338
AC_DEFUN([PHP_FPM_EPOLL],
362339
[AC_CACHE_CHECK([for epoll],
363340
[php_cv_have_epoll],
@@ -619,7 +596,6 @@ if test "$PHP_FPM" != "no"; then
619596
fpm/events/poll.c \
620597
fpm/events/epoll.c \
621598
fpm/events/kqueue.c \
622-
fpm/events/devpoll.c \
623599
fpm/events/port.c \
624600
"
625601

sapi/fpm/fpm/events/devpoll.c

Lines changed: 0 additions & 242 deletions
This file was deleted.

sapi/fpm/fpm/events/devpoll.h

Lines changed: 0 additions & 25 deletions
This file was deleted.

sapi/fpm/fpm/fpm_events.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "events/select.h"
2424
#include "events/poll.h"
2525
#include "events/epoll.h"
26-
#include "events/devpoll.h"
2726
#include "events/port.h"
2827
#include "events/kqueue.h"
2928

@@ -279,14 +278,6 @@ int fpm_event_pre_init(char *mechanism) /* {{{ */
279278
}
280279
}
281280

282-
/* /dev/poll */
283-
module = fpm_event_devpoll_module();
284-
if (module) {
285-
if (!mechanism || strcasecmp(module->name, mechanism) == 0) {
286-
return 0;
287-
}
288-
}
289-
290281
/* poll */
291282
module = fpm_event_poll_module();
292283
if (module) {

sapi/fpm/php-fpm.conf.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@
112112
; - poll (any POSIX os)
113113
; - epoll (linux >= 2.5.44)
114114
; - kqueue (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0)
115-
; - /dev/poll (Solaris >= 7)
116115
; - port (Solaris >= 10)
117116
; Default Value: not set (auto detection)
118117
;events.mechanism = epoll

0 commit comments

Comments
 (0)