diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-01 09:36:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-01 09:36:37 +0200 |
| commit | 7ed9dbafdbc724c1030404f29678559134de559b (patch) | |
| tree | c19a8d332c4485b2b84a35ba5dd7b1767b4099b0 /libxcb/src/xcb_conn.c | |
| parent | 2cf1e3de4759264eac2fa8ac758ea750636542f8 (diff) | |
| download | vcxsrv-7ed9dbafdbc724c1030404f29678559134de559b.tar.gz vcxsrv-7ed9dbafdbc724c1030404f29678559134de559b.tar.bz2 vcxsrv-7ed9dbafdbc724c1030404f29678559134de559b.zip | |
libxcb mesa pixman xkeyboard-config git update 1 oct 2012
libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef
mesa: c321b1bef15e2807de3f6225c4abcbf48969997a
pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d
xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5
Diffstat (limited to 'libxcb/src/xcb_conn.c')
| -rw-r--r-- | libxcb/src/xcb_conn.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libxcb/src/xcb_conn.c b/libxcb/src/xcb_conn.c index e01d56682..6a7a8060a 100644 --- a/libxcb/src/xcb_conn.c +++ b/libxcb/src/xcb_conn.c @@ -432,10 +432,20 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec if(ret) { + /* The code allows two threads to call select()/poll() at the same time. + * First thread just wants to read, a second thread wants to write, too. + * We have to make sure that we don't steal the reading thread's reply + * and let it get stuck in select()/poll(). + * So a thread may read if either: + * - There is no other thread that wants to read (the above situation + * did not occur). + * - It is the reading thread (above situation occurred). + */ + int may_read = c->in.reading == 1 || !count; #if USE_POLL - if((fd.revents & POLLIN) == POLLIN) + if(may_read && (fd.revents & POLLIN) == POLLIN) #else - if(FD_ISSET(c->fd, &rfds)) + if(may_read && FD_ISSET(c->fd, &rfds)) #endif ret = ret && _xcb_in_read(c); |