Skip to content

Commit 406ff32

Browse files
committed
poll: remove select backend as it is broken and not needed
1 parent a9ea252 commit 406ff32

File tree

5 files changed

+4
-362
lines changed

5 files changed

+4
-362
lines changed

build/php.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,8 +1411,8 @@ AC_DEFUN([PHP_POLL_MECHANISMS],
14111411
poll_mechanisms="$poll_mechanisms eventport"
14121412
])
14131413
1414-
dnl Set poll mechanisms including poll and select that are always available
1415-
poll_mechanisms="$poll_mechanisms poll select"
1414+
dnl Set poll mechanisms including poll that is always available
1415+
poll_mechanisms="$poll_mechanisms poll"
14161416
14171417
AC_MSG_RESULT([$poll_mechanisms])
14181418
])

configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1699,7 +1699,6 @@ PHP_ADD_SOURCES([main/poll], m4_normalize([
16991699
poll_backend_eventport.c
17001700
poll_backend_kqueue.c
17011701
poll_backend_poll.c
1702-
poll_backend_select.c
17031702
poll_core.c
17041703
poll_fd_table.c
17051704
]),

main/poll/poll_backend_select.c

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

main/poll/poll_core.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ static int num_registered_backends = 0;
2020

2121
/* Forward declarations for backend ops */
2222

23-
extern const php_poll_backend_ops php_poll_backend_poll_ops;
2423
#ifdef HAVE_EPOLL
2524
extern const php_poll_backend_ops php_poll_backend_epoll_ops;
2625
#endif
@@ -33,7 +32,7 @@ extern const php_poll_backend_ops php_poll_backend_eventport_ops;
3332
#ifdef _WIN32
3433
extern const php_poll_backend_ops php_poll_backend_iocp_ops;
3534
#endif
36-
extern const php_poll_backend_ops php_poll_backend_select_ops;
35+
extern const php_poll_backend_ops php_poll_backend_poll_ops;
3736

3837
/* Register all available backends */
3938
PHPAPI void php_poll_register_backends(void)
@@ -68,11 +67,6 @@ PHPAPI void php_poll_register_backends(void)
6867

6968
/* Poll or its emulation is always available */
7069
registered_backends[num_registered_backends++] = &php_poll_backend_poll_ops;
71-
72-
/* select() as a fallback */
73-
if (php_poll_backend_select_ops.is_available()) {
74-
registered_backends[num_registered_backends++] = &php_poll_backend_select_ops;
75-
}
7670
}
7771

7872
/* Get backend operations */

0 commit comments

Comments
 (0)