Skip to content

M
mpd
Commit f6a7dd2b authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

client: select() errors are fatal

Previously, when select() failed, we assumed that there was an invalid file descriptor in one of the client structs. Thus we tried select() one by one. This is bogus, because we should never have invalid file descriptors. Remove it, and make select() errors fatal.
parent 32bb19d0
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 29 deletions
src/client.c
View file @ f6a7dd2b
......@@ -469,26 +469,6 @@ static void client_manager_register_write_fd(fd_set * fds, int *fdmax)
}
}
static void closeNextErroredInterface(void)
{
struct client *client, *n;
fd_set fds;
struct timeval tv;
tv.tv_sec = 0;
tv.tv_usec = 0;
list_for_each_entry_safe(client, n, &clients, siblings) {
FD_ZERO(&fds);
FD_SET(client->fd, &fds);
if (select(client->fd + 1,
&fds, NULL, NULL, &tv) < 0) {
client_close(client);
return;
}
}
}
int client_manager_io(void)
{
fd_set rfds;
......@@ -511,19 +491,15 @@ int client_manager_io(void)
selret = select(fdmax + 1, &rfds, &wfds, &efds, NULL);
main_notify_unlock();
if (selret < 0 && errno == EINTR)
break;
registered_IO_consume_fds(&selret, &rfds, &wfds, &efds);
if (selret == 0)
if (selret < 0) {
if (errno == EINTR)
break;
if (selret < 0) {
closeNextErroredInterface();
continue;
FATAL("select() failed: %s\n", strerror(errno));
}
registered_IO_consume_fds(&selret, &rfds, &wfds, &efds);
getConnections(&rfds);
list_for_each_entry_safe(client, n, &clients, siblings) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment