diff options
Diffstat (limited to 'src/xcb_conn.c')
-rw-r--r-- | src/xcb_conn.c | 49 |
1 files changed, 1 insertions, 48 deletions
diff --git a/src/xcb_conn.c b/src/xcb_conn.c index 02f60bd..2bb8661 100644 --- a/src/xcb_conn.c +++ b/src/xcb_conn.c @@ -59,21 +59,6 @@ static int set_fd_flags(const int fd) return 1; } -static int _xcb_xlib_init(_xcb_xlib *xlib) -{ - xlib->lock = 0; -#ifndef NDEBUG - xlib->sloppy_lock = (getenv("LIBXCB_ALLOW_SLOPPY_LOCK") != 0); -#endif - pthread_cond_init(&xlib->cond, 0); - return 1; -} - -static void _xcb_xlib_destroy(_xcb_xlib *xlib) -{ - pthread_cond_destroy(&xlib->cond); -} - static int write_setup(xcb_connection_t *c, xcb_auth_info_t *auth_info) { static const char pad[3]; @@ -230,7 +215,6 @@ xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info) if(!( set_fd_flags(fd) && pthread_mutex_init(&c->iolock, 0) == 0 && - _xcb_xlib_init(&c->xlib) && _xcb_in_init(&c->in) && _xcb_out_init(&c->out) && write_setup(c, auth_info) && @@ -255,7 +239,6 @@ void xcb_disconnect(xcb_connection_t *c) close(c->fd); pthread_mutex_destroy(&c->iolock); - _xcb_xlib_destroy(&c->xlib); _xcb_in_destroy(&c->in); _xcb_out_destroy(&c->out); @@ -275,12 +258,6 @@ void _xcb_conn_shutdown(xcb_connection_t *c) void _xcb_lock_io(xcb_connection_t *c) { pthread_mutex_lock(&c->iolock); - while(c->xlib.lock) - { - if(pthread_equal(c->xlib.thread, pthread_self())) - break; - pthread_cond_wait(&c->xlib.cond, &c->iolock); - } } void _xcb_unlock_io(xcb_connection_t *c) @@ -290,25 +267,12 @@ void _xcb_unlock_io(xcb_connection_t *c) 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); - 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 ret, xlib_locked; + int ret; fd_set rfds, wfds; /* If the thing I should be doing is already being done, wait for it. */ @@ -329,12 +293,6 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec ++c->out.writing; } - 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); @@ -345,11 +303,6 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec ret = 0; } _xcb_lock_io(c); - if(xlib_locked) - { - c->xlib.lock = 1; - c->xlib.thread = pthread_self(); - } if(ret) { |