diff options
| -rw-r--r-- | src/xcb_conn.c | 3 | ||||
| -rw-r--r-- | src/xcb_xlib.c | 10 | ||||
| -rw-r--r-- | src/xcbint.h | 1 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/xcb_conn.c b/src/xcb_conn.c index 3b315bc..827a12b 100644 --- a/src/xcb_conn.c +++ b/src/xcb_conn.c @@ -62,6 +62,9 @@ static int set_fd_flags(const int fd) 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; } diff --git a/src/xcb_xlib.c b/src/xcb_xlib.c index 35ad3c3..1b573e8 100644 --- a/src/xcb_xlib.c +++ b/src/xcb_xlib.c @@ -55,9 +55,9 @@ static void xcb_xlib_printbt(void) } #ifndef NDEBUG -#define xcb_assert(x) do { if (!(x)) { xcb_xlib_printbt(); assert(x); } } while(0) +#define xcb_assert(c,x) do { if (!(x)) { xcb_xlib_printbt(); if (!(c)->xlib.sloppy_lock) assert(x); } } while(0) #else -#define xcb_assert(x) +#define xcb_assert(c,x) #endif unsigned int xcb_get_request_sent(xcb_connection_t *c) @@ -70,7 +70,7 @@ unsigned int xcb_get_request_sent(xcb_connection_t *c) void xcb_xlib_lock(xcb_connection_t *c) { _xcb_lock_io(c); - xcb_assert(!c->xlib.lock); + xcb_assert(c, !c->xlib.lock); c->xlib.lock = 1; c->xlib.thread = pthread_self(); _xcb_unlock_io(c); @@ -79,8 +79,8 @@ void xcb_xlib_lock(xcb_connection_t *c) void xcb_xlib_unlock(xcb_connection_t *c) { _xcb_lock_io(c); - xcb_assert(c->xlib.lock); - xcb_assert(pthread_equal(c->xlib.thread, pthread_self())); + xcb_assert(c, c->xlib.lock); + xcb_assert(c, pthread_equal(c->xlib.thread, pthread_self())); c->xlib.lock = 0; pthread_cond_broadcast(&c->xlib.cond); _xcb_unlock_io(c); diff --git a/src/xcbint.h b/src/xcbint.h index a8e167c..ab692ee 100644 --- a/src/xcbint.h +++ b/src/xcbint.h @@ -130,6 +130,7 @@ int _xcb_in_read_block(xcb_connection_t *c, void *buf, int nread); typedef struct _xcb_xlib { int lock; + int sloppy_lock; pthread_t thread; pthread_cond_t cond; } _xcb_xlib; |