summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch58
1 files changed, 0 insertions, 58 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch b/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
deleted file mode 100644
index 2a723b7e43..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From 5235a7f3692a4c3c90dd4ac1be3c670388904bbe Mon Sep 17 00:00:00 2001
2From: Tatu Frisk <tatu.frisk@ge.com>
3Date: Tue, 14 Mar 2017 14:41:27 +0200
4Subject: [PATCH] Fix hanging issue in _XReply
5
6Assume event queue is empty if another thread is blocking waiting for event.
7
8If one thread was blocking waiting for an event and another thread sent a
9reply to the X server, both threads got blocked until an event was
10received.
11
12Upstream-Status: Submitted [https://patchwork.freedesktop.org/patch/171458/]
13
14This patch needs to be removed once the corresponding patch has been merged upstream.
15
16https://patchwork.freedesktop.org/patch/171458/
17
18Signed-off-by: Tatu Frisk <tatu.frisk@ge.com>
19Signed-off-by: Jose Alarcon <jose.alarcon@ge.com>
20
21[Refreshed for 1.6.7 update]
22Signed-off-by: Armin Kuster <akuster808@gmail.com>
23
24---
25 src/xcb_io.c | 19 +++++++------------
26 1 file changed, 7 insertions(+), 12 deletions(-)
27
28Index: libX11-1.6.7/src/xcb_io.c
29===================================================================
30--- libX11-1.6.7.orig/src/xcb_io.c
31+++ libX11-1.6.7/src/xcb_io.c
32@@ -620,18 +620,14 @@ Status _XReply(Display *dpy, xReply *rep
33 if(dpy->xcb->event_owner == XlibOwnsEventQueue)
34 {
35 xcb_generic_reply_t *event;
36- /* If some thread is already waiting for events,
37- * it will get the first one. That thread must
38- * process that event before we can continue. */
39- /* FIXME: That event might be after this reply,
40- * and might never even come--or there might be
41- * multiple threads trying to get events. */
42- while(dpy->xcb->event_waiter)
43- { /* need braces around ConditionWait */
44- ConditionWait(dpy, dpy->xcb->event_notify);
45- }
46- while((event = poll_for_event(dpy, True)))
47- handle_response(dpy, event, True);
48+
49+ /* Assume event queue is empty if another thread is blocking
50+ * waiting for event. */
51+ if(!dpy->xcb->event_waiter)
52+ {
53+ while((event = poll_for_response(dpy)))
54+ handle_response(dpy, event, True);
55+ }
56 }
57
58 req->reply_waiter = 0;