Retry a select() if it returns with EINTR. Fixes IO errors in Xephyr, which is

often interrupted by timers.

diff --git a/src/xcb_conn.c b/src/xcb_conn.c
index 1e93137..95b5fa2 100644 (file)
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
@@ -253,7 +253,11 @@ int _xcb_conn_wait(XCBConnection *c, pthread_cond_t *cond, struct iovec **vector
     }
 
     pthread_mutex_unlock(&c->iolock);
-    ret = select(c->fd + 1, &rfds, &wfds, 0, 0) > 0;
+    do {
+       ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
+    } while (ret == -1 && errno == EINTR);
+    if (ret < 0)
+       ret = 0;
     pthread_mutex_lock(&c->iolock);
 
     if(ret)

diff --git a/src/xcb_in.c b/src/xcb_in.c
index fa13e90..76f9702 100644 (file)
--- a/src/xcb_in.c
+++ b/src/xcb_in.c
@@ -229,7 +229,9 @@ static int read_block(const int fd, void *buf, const size_t len)
             fd_set fds;
             FD_ZERO(&fds);
             FD_SET(fd, &fds);
-            ret = select(fd + 1, &fds, 0, 0, 0);
+           do {
+               ret = select(fd + 1, &fds, 0, 0, 0);
+           } while (ret == -1 && errno == EINTR);
         }
         if(ret <= 0)
             return ret;