empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't log out player when update aborts a command with pthreads

Browse source 
pthread.c's empth_select() returned -1 when empth_wakeup() interrupted
select().  The failure then got propagated all the way up, and the
player got logged out.  Fix by returning 0 in that case.  While there,
retry on EINTR, to match LWP.  Also clarify comments.
This commit is contained in:
Markus Armbruster 2009-03-01 11:34:50 +01:00
parent 5073b022fd
commit eea9e76bf8
3 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/lib/empthread/pthread.c
View file

@ -280,11 +280,13 @@ empth_select(int fd, int flags, struct timeval *timeout)
fd_set writemask;
struct timeval tv;
int n;
empth_t *ctx;
int res = 0;
pthread_mutex_unlock(&mtx_ctxsw);
empth_status("select on %d for %d", fd, flags);
again:
FD_ZERO(&readmask);
FD_ZERO(&writemask);
if (flags & EMPTH_FD_READ)
@ -292,18 +294,21 @@ empth_select(int fd, int flags, struct timeval *timeout)
if (flags & EMPTH_FD_WRITE)
FD_SET(fd, &writemask);
if (timeout) {
if (timeout)
tv = *timeout;
timeout = &tv;
}
n = select(fd + 1, &readmask, &writemask, NULL, timeout);
n = select(fd + 1, &readmask, &writemask, NULL, timeout ? &tv : NULL);
if (n < 0) {
if (errno == EINTR) /* go handle the signal */
ctx = pthread_getspecific(ctx_key);
if (ctx->wakeup) {
empth_status("select woken up");
res = 0;
} else if (errno == EINTR) {
empth_status("select broken by signal");
else
goto again;
} else {
empth_status("select failed (%s)", strerror(errno));
res = -1;
res = -1;
}
} else if (n == 0) {
empth_status("select timed out");
res = 0;