X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_xlib.c;h=1b573e8a5151630efee64c77de06c5c440eb5ea3;hb=4d828c5eba9fc7161c5f18650f2dbe218e1db06f;hp=5e56426c3a400e18106638d731c1f00fa8f45c2f;hpb=a3bd6f4760b5b3f5f360a690920839646e2b9d06;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_xlib.c b/src/xcb_xlib.c
index 5e56426..1b573e8 100644
--- a/src/xcb_xlib.c
+++ b/src/xcb_xlib.c
@@ -26,6 +26,40 @@
 #include "xcbxlib.h"
 #include "xcbint.h"
 
+#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)
@@ -33,9 +67,21 @@ unsigned int xcb_get_request_sent(xcb_connection_t *c)
     return c->out.request;
 }
 
-pthread_mutex_t *xcb_get_io_lock(xcb_connection_t *c)
+void xcb_xlib_lock(xcb_connection_t *c)
 {
-    if(c->has_error)
-        return 0;
-    return &c->iolock;
+    _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)
+{
+    _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);
 }