Minor performance improvement: do not call _xcb_in_expect_reply unless it is needed...

[free-sw/xcb/libxcb] / src / xcb_conn.c

diff --git a/src/xcb_conn.c b/src/xcb_conn.c
index 1e93137..f25cc20 100644 (file)
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <netinet/in.h>
 #include <sys/select.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
 #include <errno.h>
 
 #include "xcb.h"
@@ -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)