andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

os: Remove CheckConnections

Browse Source 
poll provides per-fd notification of failure, so we don't need
CheckConnections anymore.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Keith Packard 2016-05-29 12:45:53 -07:00 committed by Adam Jackson
parent f0275b1e5a
commit 50779c494d
3 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/os.h
View File

@ -141,8 +141,6 @@ extern _X_EXPORT const char *ClientAuthorized(ClientPtr /*client */ ,
unsigned int /*string_n */ ,
char * /*auth_string */ );
extern _X_EXPORT void CheckConnections(void);
extern _X_EXPORT void CloseDownConnection(ClientPtr /*client */ );
typedef void (*NotifyFdProcPtr)(int fd, int ready, void *data);

6
os/WaitFor.c
View File

@ -206,11 +206,7 @@ WaitForSomething(Bool are_ready)
if (dispatchException)
return FALSE;
if (i < 0) {
if (pollerr == EBADF) { /* Some client disconnected */
CheckConnections();
return FALSE;
}
else if (pollerr == EINVAL) {
if (pollerr == EINVAL) {
FatalError("WaitForSomething(): poll: %s\n",
strerror(pollerr));
}

36
os/connection.c
View File

@ -47,7 +47,7 @@ SOFTWARE.
* Stuff to create connections --- OS dependent
*
* EstablishNewConnections, CreateWellKnownSockets, ResetWellKnownSockets,
* CloseDownConnection, CheckConnections
* CloseDownConnection,
* OnlyListToOneClient,
* ListenToAllClients,
*
@ -78,7 +78,6 @@ SOFTWARE.
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <poll.h>
#ifndef WIN32
#include <sys/socket.h>
@ -898,39 +897,6 @@ CloseDownFileDescriptor(OsCommPtr oc)
ospoll_remove(server_poll, connection);
}
/*****************
* CheckConnections
* Some connection has died, go find which one and shut it down
* The file descriptor has been closed, but is still in AllClients.
* If would truly be wonderful if select() would put the bogus
* file descriptors in the exception mask, but nooooo. So we have
* to check each and every socket individually.
*****************/
void
CheckConnections(void)
{
int i;
int r;
for (i = 1; i < currentMaxClients; i++) {
ClientPtr client = clients[i];
if (!client->clientGone) {
OsCommPtr oc = (OsCommPtr) client->osPrivate;
struct pollfd poll_fd;
poll_fd.fd = oc->fd;
poll_fd.events = POLLIN|POLLOUT;
do {
r = poll(&poll_fd, 1, 0);
} while (r < 0 && (errno == EINTR || errno == EAGAIN));
if (r < 0)
CloseDownClient(client);
}
}
}
/*****************
* CloseDownConnection
* Delete client from AllClients and free resources