summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f6b75d6)
With this patch, `ico -threads 2` runs without deadlock.
Many thanks to Christoph Pfister <christophpfister@gmail.com> for
pointing out the problem, providing detailed analyses, explaining it to
me repeatedly until I understood what was going on, and proposing and
reviewing possible solutions.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Acked-by: Christoph Pfister <christophpfister@gmail.com>
void _xcb_wait_io(xcb_connection_t *c, pthread_cond_t *cond)
{
void _xcb_wait_io(xcb_connection_t *c, pthread_cond_t *cond)
{
+ int xlib_locked = c->xlib.lock;
+ if(xlib_locked)
+ {
+ c->xlib.lock = 0;
+ pthread_cond_broadcast(&c->xlib.cond);
+ }
pthread_cond_wait(cond, &c->iolock);
pthread_cond_wait(cond, &c->iolock);
+ if(xlib_locked)
+ {
+ while(c->xlib.lock)
+ pthread_cond_wait(&c->xlib.cond, &c->iolock);
+ c->xlib.lock = 1;
+ c->xlib.thread = pthread_self();
+ }
}
int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count)
{
}
int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count)
{
fd_set rfds, wfds;
/* If the thing I should be doing is already being done, wait for it. */
fd_set rfds, wfds;
/* If the thing I should be doing is already being done, wait for it. */
+ xlib_locked = c->xlib.lock;
+ if(xlib_locked)
+ {
+ c->xlib.lock = 0;
+ pthread_cond_broadcast(&c->xlib.cond);
+ }
_xcb_unlock_io(c);
do {
ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
_xcb_unlock_io(c);
do {
ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
ret = 0;
}
_xcb_lock_io(c);
ret = 0;
}
_xcb_lock_io(c);
+ if(xlib_locked)
+ {
+ c->xlib.lock = 1;
+ c->xlib.thread = pthread_self();
+ }