Prevent reply waiters from being blocked.
authorRami Ylimäki <rami.ylimaki@vincit.fi>
Wed, 13 Oct 2010 14:48:13 +0000 (17:48 +0300)
committerJamey Sharp <jamey@minilop.net>
Tue, 15 Mar 2011 00:19:14 +0000 (17:19 -0700)
It's possible to call xcb_wait_for_reply more than once for a single
request. In this case we are nice and let reply waiters continue so
that they can notice that the reply is not available
anymore. Otherwise an event waiter could just signal the reply waiter
that got its reply to continue but leave a waiter for an earlier reply
blocked.

Below is an example sequence for reproducing this problem.

thread #1 (XNextEvent)
  - waits for events
thread #2 (XSync)
  - executes request #2
  - waits for reply #2
thread #1
  - reads reply #2
  - signals waiter of reply #2 to continue
  - waits for events
thread #2
  - handles reply #2
thread #3 (XCloseDisplay)
  - executes request #3
  - waits for reply #2
thread #1
  - reads reply #3
  - nobody is waiting for reply #3 so don't signal
  - wait for events

Of course it may be questionable to wait for a reply twice, but XCB
should be smart enough to let clients continue if they choose to do
so.

Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Signed-off-by: Jamey Sharp <jamey@minilop.net>
src/xcb_in.c

index a084b3f..7d34429 100644 (file)
@@ -211,9 +211,9 @@ static int read_packet(xcb_connection_t *c)
            XCB_SEQUENCE_COMPARE(reader->request, <=, c->in.request_read);
            reader = reader->next)
        {
+            pthread_cond_signal(reader->data);
             if(reader->request == c->in.request_read)
             {
-                pthread_cond_signal(reader->data);
                 break;
             }
        }