Don't abort() on locking assertions if LIBXCB_ALLOW_SLOPPY_LOCK is set.

[free-sw/xcb/libxcb] / src / xcb_xlib.c

diff --git a/src/xcb_xlib.c b/src/xcb_xlib.c
index 61518f7..1b573e8 100644 (file)
--- a/src/xcb_xlib.c
+++ b/src/xcb_xlib.c
@@ -26,12 +26,62 @@
 #include "xcbxlib.h"
 #include "xcbint.h"
 
-unsigned int XCBGetRequestSent(XCBConnection *c)
+#include <assert.h>
+
+#ifdef HAVE_BACKTRACE
+#include <execinfo.h>
+#include <stdio.h>
+#include <stdlib.h>
+#endif
+
+static void xcb_xlib_printbt(void)
 {
+#ifdef HAVE_BACKTRACE
+       void *array[20];
+       int size;
+       char **strings;
+       int i;
+
+       size = backtrace(array, 20);
+       strings = backtrace_symbols(array, size);
+
+       fprintf(stderr, "Locking assertion failure.  Backtrace:\n");
+
+       for (i = 0; i < size; ++i)
+               fprintf(stderr, "#%i %s\n", i, strings[i]);
+
+       free(strings);
+#endif
+}
+
+#ifndef NDEBUG
+#define xcb_assert(c,x) do { if (!(x)) { xcb_xlib_printbt(); if (!(c)->xlib.sloppy_lock) assert(x); } } while(0)
+#else
+#define xcb_assert(c,x)
+#endif
+
+unsigned int xcb_get_request_sent(xcb_connection_t *c)
+{
+    if(c->has_error)
+        return 0;
     return c->out.request;
 }
 
-pthread_mutex_t *XCBGetIOLock(XCBConnection *c)
+void xcb_xlib_lock(xcb_connection_t *c)
+{
+    _xcb_lock_io(c);
+    xcb_assert(c, !c->xlib.lock);
+    c->xlib.lock = 1;
+    c->xlib.thread = pthread_self();
+    _xcb_unlock_io(c);
+}
+
+void xcb_xlib_unlock(xcb_connection_t *c)
 {
-    return &c->iolock;
+    _xcb_lock_io(c);
+    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);
 }