Skip to content

Commit 9db195b

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 54e5e7b commit 9db195b

File tree

4 files changed

+0
-300
lines changed

4 files changed

+0
-300
lines changed

sapi/fpm/config.m4

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -335,29 +335,6 @@ AC_DEFUN([PHP_FPM_KQUEUE],
335335
])
336336
])
337337

338-
AC_DEFUN([PHP_FPM_DEVPOLL],
339-
[
340-
AC_MSG_CHECKING([for /dev/poll])
341-
342-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
343-
#include <stdio.h>
344-
#include <sys/devpoll.h>
345-
]], [[
346-
int n, dp;
347-
struct dvpoll dvp;
348-
dp = 0;
349-
dvp.dp_fds = NULL;
350-
dvp.dp_nfds = 0;
351-
dvp.dp_timeout = 0;
352-
n = ioctl(dp, DP_POLL, &dvp)
353-
]])], [
354-
AC_DEFINE([HAVE_DEVPOLL], 1, [do we have /dev/poll?])
355-
AC_MSG_RESULT([yes])
356-
], [
357-
AC_MSG_RESULT([no])
358-
])
359-
])
360-
361338
AC_DEFUN([PHP_FPM_EPOLL],
362339
[
363340
AC_MSG_CHECKING([for epoll])
@@ -624,7 +601,6 @@ if test "$PHP_FPM" != "no"; then
624601
fpm/events/poll.c \
625602
fpm/events/epoll.c \
626603
fpm/events/kqueue.c \
627-
fpm/events/devpoll.c \
628604
fpm/events/port.c \
629605
"
630606

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) {

0 commit comments

Comments
 (0)