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

[empserver] / src / lib / empthread / pthread.c

diff --git a/src/lib/empthread/pthread.c b/src/lib/empthread/pthread.c
index 9c1163ff5fc888b793f06c64f55df88c2d7c015f..fb1e09a93044992224f710dbc3d82aedbc4d392f 100644 (file)
--- a/src/lib/empthread/pthread.c
+++ b/src/lib/empthread/pthread.c
@@ -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;