From 5d1dbb468bb0f834eaa8adea6daf6729808ca429 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Mon, 18 Nov 2013 19:49:41 +0100 Subject: Revert "fix deadlock with xcb_take_socket/return_socket v3" This reverts commit 9ae84ad187e2ba440c40f44b8eb21c82c2fdbf12. After this patch was merged, there were complaints about it not being a good idea. Revert this for now until we can agree on this. References: http://lists.freedesktop.org/archives/xcb/2013-June/008340.html Signed-off-by: Uli Schlachter Conflicts: src/xcbint.h --- src/xcbint.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/xcbint.h') diff --git a/src/xcbint.h b/src/xcbint.h index 5c904fb..b25f03b 100644 --- a/src/xcbint.h +++ b/src/xcbint.h @@ -79,8 +79,6 @@ void *_xcb_map_remove(_xcb_map *q, unsigned int key); /* xcb_out.c */ -typedef void (*xcb_return_socket_func_t)(void *closure); - #if HAVE_SENDMSG #define XCB_MAX_PASS_FD 16 @@ -95,9 +93,10 @@ typedef struct _xcb_out { pthread_cond_t cond; int writing; - xcb_return_socket_func_t return_socket; + pthread_cond_t socket_cond; + void (*return_socket)(void *closure); void *socket_closure; - unsigned int socket_seq; + int socket_moving; char queue[XCB_QUEUE_BUFFER_SIZE]; int queue_len; -- cgit v1.2.3