oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

client: select() errors are fatal

Browse Source 
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.
This commit is contained in:
Max Kellermann 2008-08-28 20:20:10 +02:00
parent 32bb19d03f
commit f6a7dd2b45
1 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/client.c
View File

@ -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;
if (selret < 0) {
if (errno == EINTR)
break;
FATAL("select() failed: %s\n", strerror(errno));
}
registered_IO_consume_fds(&selret, &rfds, &wfds, &efds);
if (selret == 0)
break;
if (selret < 0) {
closeNextErroredInterface();
continue;
}
getConnections(&rfds);
list_for_each_entry_safe(client, n, &clients, siblings) {