mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-33075 [backport/2f5174e556] eliminated support for #ifndef HAVE_POLL

Browse source 
Backport of 2f5174e556:
MDEV-33075 Resolve server shutdown issues on macOS, Solaris, and FreeBSD.

Eliminated support for `#ifndef HAVE_POLL` in `handle_connection_sockets`
This code is also dead, since 10.4

Signed-off-by: Ivan Prisyazhnyy <john.koepi@gmail.com>
This commit is contained in:
Ivan Prisyazhnyy 2024-08-18 21:40:34 +02:00 committed by Vicențiu-Marian Ciorbaru
parent 5be859d52c
commit 490274e850
1 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sql/mysqld.cc
View file

@ -6270,7 +6270,6 @@ void handle_connections_sockets()
uint error_count=0; uint error_count=0;
struct sockaddr_storage cAddr; struct sockaddr_storage cAddr;
int retval; int retval;
#ifdef HAVE_POLL
int socket_count= 0; int socket_count= 0;
struct pollfd fds[3]; // for ip_sock, unix_sock and extra_ip_sock struct pollfd fds[3]; // for ip_sock, unix_sock and extra_ip_sock
MYSQL_SOCKET pfs_fds[3]; // for performance schema MYSQL_SOCKET pfs_fds[3]; // for performance schema
@ -6280,11 +6279,6 @@ void handle_connections_sockets()
fds[socket_count].fd= mysql_socket_getfd(X); \ fds[socket_count].fd= mysql_socket_getfd(X); \
fds[socket_count].events= POLLIN; \ fds[socket_count].events= POLLIN; \
socket_count++ socket_count++
#else
#define setup_fds(X) FD_SET(mysql_socket_getfd(X),&clientFDs)
fd_set readFDs,clientFDs;
FD_ZERO(&clientFDs);
#endif
DBUG_ENTER("handle_connections_sockets"); DBUG_ENTER("handle_connections_sockets");
@ -6309,12 +6303,7 @@ void handle_connections_sockets()
DBUG_PRINT("general",("Waiting for connections.")); DBUG_PRINT("general",("Waiting for connections."));
while (!abort_loop) while (!abort_loop)
{ {
#ifdef HAVE_POLL
retval= poll(fds, socket_count, -1); retval= poll(fds, socket_count, -1);
#else
readFDs=clientFDs;
retval= select((int) 0,&readFDs,0,0,0);
#endif
if (retval < 0) if (retval < 0)
{ {
@ -6336,7 +6325,6 @@ void handle_connections_sockets()
break; break;
/* Is this a new connection request ? */ /* Is this a new connection request ? */
#ifdef HAVE_POLL
for (int i= 0; i < socket_count; ++i) for (int i= 0; i < socket_count; ++i)
{ {
if (fds[i].revents & POLLIN) if (fds[i].revents & POLLIN)
@ -6345,15 +6333,6 @@ void handle_connections_sockets()
break; break;
} }
} }
#else // HAVE_POLL
if (FD_ISSET(mysql_socket_getfd(base_ip_sock),&readFDs))
sock= base_ip_sock;
else
if (FD_ISSET(mysql_socket_getfd(extra_ip_sock),&readFDs))
sock= extra_ip_sock;
else
sock = unix_sock;
#endif // HAVE_POLL
for (uint retry=0; retry < MAX_ACCEPT_RETRY && !abort_loop; retry++) for (uint retry=0; retry < MAX_ACCEPT_RETRY && !abort_loop; retry++)
{ {