frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call _xcb_wake_up_next_reader from xcb_wait_for_special_event 

All functions calling _xcb_conn_wait() must make sure that waiting
readers are woken up when we read a reply or event that they are waiting
for. xcb_wait_for_special_event() did not do so. This adds the missing
call to_xcb_in_wake_up_next_reader().

Fixes deadlock when waiting for a special event and concurrently
processing the display connection queue in another thread.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84252
Tested-by: Thomas Daede <bztdlinux@gmail.com>
Tested-by: Clément Guérin <geecko.dev@free.fr>
Reviewed-by: Uli Schlachter <psychon@znc.in>
Signed-off-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Michel Dänzer 2015-06-01 11:04:18 +09:00 committed by Uli Schlachter
parent 8584c0e095
commit f85661c3bc
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/xcb_in.c
View File

@ -761,6 +761,7 @@ xcb_generic_event_t *xcb_wait_for_special_event(xcb_connection_t *c,
if(!_xcb_conn_wait(c, &se->special_event_cond, 0, 0)) if(!_xcb_conn_wait(c, &se->special_event_cond, 0, 0))
break; break;
_xcb_in_wake_up_next_reader(c);
pthread_mutex_unlock(&c->iolock); pthread_mutex_unlock(&c->iolock);
return event; return event;
} }