Skip to content
GitLab
  1. 25 Apr, 2019 1 commit
  3. 17 Feb, 2019 2 commits
  5. 16 Feb, 2019 2 commits
  7. 07 Jan, 2019 1 commit
  9. 27 Sep, 2018 1 commit
  11. 21 Aug, 2018 1 commit
    • Erik Kurzinger's avatar
      don't flag extra reply in xcb_take_socket · bbda345a
      Erik Kurzinger authored and Uli Schlachter's avatar Uli Schlachter committed 
      If any flags are specified in a call to xcb_take_socket,
they should only be applied to replies for requests sent
after that function returns (and until the socket is
re-acquired by XCB).

Previously, they would also be incorrectly applied to the
reply for the last request sent before the socket was taken.
For instance, in this example program the reply for the
GetInputFocus request gets discarded, even though it was
sent before the socket was taken. This results in the
call to retrieve the reply hanging indefinitely.

static void return_socket(void *closure) {}

int main(void)
{
    Display *dpy = XOpenDisplay(NULL);
    xcb_connection_t *c = XGetXCBConnection(dpy);

    xcb_get_input_focus_cookie_t cookie = xcb_get_input_focus_unchecked(c);
    xcb_flush(c);

    uint64_t seq;
    xcb_take_socket(c, return_socket, dpy, XCB_REQUEST_DISCARD_REPLY, &seq);

    xcb_generic_error_t *err;
    xcb_get_input_focus_reply(c, cookie, &err);
}

In practice, this has been causing intermittent KWin crashes when
used in combination with the proprietary NVIDIA driver such as
https://bugs.kde.org/show_bug.cgi?id=386370

 since when Xlib fails to
retrieve one of these incorrectly discarded replies it triggers
an IO error.

Signed-off-by: Erik Kurzinger's avatarErik Kurzinger <ekurzinger@nvidia.com>
Signed-off-by: Uli Schlachter's avatarUli Schlachter <psychon@znc.in>
      bbda345a
  13. 28 Feb, 2018 1 commit
  15. 05 Jun, 2017 2 commits
  17. 13 May, 2017 2 commits
  19. 01 Apr, 2017 1 commit
  21. 11 Mar, 2017 3 commits
    • Christian Linhart's avatar
      add support for eventstruct · ee9dfc9a
      Christian Linhart authored 
      

eventstruct allows to use events as part of requests.
This is, e.g., needed by xcb_input_send_extension_event.

Signed-off-by: Christian Linhart's avatarChristian Linhart <chris@demorecorder.com>
      ee9dfc9a
    • Christian Linhart's avatar
      optionally build the GE extension · 0c2c5d50
      Christian Linhart authored 
      

xcb contains an xml-definition for the GenericEvent extension
but this extension was neither generated nor built.

This patch enables optional building of the GenericEvent extension
with configure option --enable-ge

By default, the GenericEvent extension is not built.
Normally this is not needed by application programs
because there is implicit support for the GE-extension
for the specific events built with this extension.

But it may be useful for X-protocol analyzers and stuff like that.

Signed-off-by: Christian Linhart's avatarChristian Linhart <chris@demorecorder.com>
      0c2c5d50
    • Christian Linhart's avatar
      move symbol lookup of sumof expr to the parser · 9bce1f72
      Christian Linhart authored 
      

replace the complicated symboltable lookup for sumof expr
by accessing the lenfield of the expr-object.

This requires the corresponding patch for xcb/proto
which sets the lenfield accordingly.

This should be OK because for official releases we define
that dependency in the build system.

For getting versions off the HEAD of the git repo, it should
be obvious that xcb/proto and xcb/libxcb have to be updated together.

I have tested this patch and it generates exactly the same code
as before.

Tested-by: Christian Linhart's avatarChristian Linhart <chris@demorecorder.com>
Signed-off-by: Christian Linhart's avatarChristian Linhart <chris@demorecorder.com>
      9bce1f72
  23. 29 May, 2016 2 commits
  25. 28 May, 2016 1 commit
  27. 18 May, 2016 1 commit
  29. 14 May, 2016 1 commit
  31. 01 Feb, 2016 2 commits
  33. 06 Jan, 2016 3 commits
  35. 21 Sep, 2015 1 commit
  37. 13 Aug, 2015 1 commit
  39. 04 Jul, 2015 2 commits
  41. 25 Jun, 2015 1 commit
    • Uli Schlachter's avatar
      Fix a thread hang with xcb_wait_for_special_event() · 5b40681c
      Uli Schlachter authored 
      Consider the following:

- Two threads are calling xcb_wait_for_special_event() and xcb_wait_for_reply()
  concurrently.
- The thread doing xcb_wait_for_reply() wins the race and poll()s the socket for
  readability.
- The other thread will be put to sleep on the special_event_cond of the special
  event (this is done in _xcb_conn_wait() via the argument
  xcb_wait_for_special_event() gives it).
- The first thread gets its reply, but does not yet receive any special event.

In this case, the first thread will return to its caller. On its way out, it
will call _xcb_in_wake_up_next_reader(), but that function cannot wake up
anything since so far it did not handle xcb_wait_for_special_event().

Thus, the first thread stays blocked on the condition variable and no thread
tries to read from the socket.

A test case demonstrating this problem is available at the bug report.

Fix this similar to how we handle this with xcb_wait_for_reply():

The function wait_for_reply() adds an entry into a linked list of threads that
wait for a reply. Via this list, _xcb_in_wake_up_next_reader() can wake up this
thread so that it can call _xcb_conn_wait() again and then poll()s the socket.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84252


Signed-off-by: Uli Schlachter's avatarUli Schlachter <psychon@znc.in>
Tested-by: Michel Dänzer's avatarMichel Dänzer <michel.daenzer@amd.com>
      5b40681c
  43. 12 Jun, 2015 6 commits
    • Michel Dänzer's avatar
      Call _xcb_wake_up_next_reader from xcb_wait_for_special_event · f85661c3
      Michel Dänzer authored and Uli Schlachter's avatar Uli Schlachter committed 
      All functions calling _xcb_conn_wait() must make sure that waiting
readers are woken up when we read a reply or event that they are waiting
for. xcb_wait_for_special_event() did not do so. This adds the missing
call to_xcb_in_wake_up_next_reader().

Fixes deadlock when waiting for a special event and concurrently
processing the display connection queue in another thread.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84252


Tested-by: default avatarThomas Daede <bztdlinux@gmail.com>
Tested-by: default avatarClément Guérin <geecko.dev@free.fr>
Reviewed-by: Uli Schlachter's avatarUli Schlachter <psychon@znc.in>
Signed-off-by: Michel Dänzer's avatarMichel Dänzer <michel@daenzer.net>
Signed-off-by: Uli Schlachter's avatarUli Schlachter <psychon@znc.in>
      f85661c3
    • Uli Schlachter's avatar
      send_fds(): Handle too many outstanding FDs to send · 8584c0e0
      Uli Schlachter authored 
      

Before this patch, the following code caused an endless loop in send_fds(),
because the queue of FDs to send was eventually full, but _xcb_out_flush_to()
didn't make any progress, since there was no request to send:

   while (1) { xcb_send_fd(conn, dup(some_fd)); }

Fix this by sending a sync when flushing didn't make any progress. That way we
actually have something to send and can attach the pending FDs.

Because send_fds() can now send requests, the code in
xcb_send_request_with_fds64() has to be changed. It has to call send_fds()
before it establishes a good sequence number for the request it wants to send.

Signed-off-by: Uli Schlachter's avatarUli Schlachter <psychon@znc.in>
      8584c0e0
    • Uli Schlachter's avatar
      Code generator: Use xcb_send_request_with_fds() · 658fb4a5
      Uli Schlachter authored 
      

Signed-off-by: Uli Schlachter's avatarUli Schlachter <psychon@znc.in>
      658fb4a5
    • Uli Schlachter's avatar
      Add xcb_send_request_with_fds() and *_with_fds64() · b15aa6bd
      Uli Schlachter authored 
      

Doing xcb_send_fd(), xcb_send_request() is racy. If two threads do this at the
same time, they could mix up their file descriptors. This commit makes it
possibly to fix this race by providing a single function which does everything
that is needed.

Signed-off-by: Uli Schlachter's avatarUli Schlachter <psychon@znc.in>
      b15aa6bd
    • Uli Schlachter's avatar
      send_fds(): Make sure no other thread interrupts us · cc04cfb4
      Uli Schlachter authored 
      Two threads trying to send fds at the same time could interfere. To guarantee a
correct ordering, we have to use correct locking. The code in send_fds() missed
one case: If there was another thread already writing requests, we slept on the
"done with writing" condition variable (c->out.cond). This would allow other
threads to re-acquire the iolock before us and could cause fds to be sent out of
order.

To fix this, at the beginning of send_fds() we now make sure that no other
thread is already writing requests. This is what prepare_socket_request() does.
Additionally, it gets the socket back in case xcb_take_socket() was called,
which is a good thing, too, since fds are only sent with corresponding requests.
      cc04cfb4
    • Uli Schlachter's avatar
      xcb_send_fd(): Always close fds · 25f9e7e4
      Uli Schlachter authored 
      

The API docs for xcb_send_fd() says "After this function returns, the file
descriptor given is owned by xcb and will be closed eventually".

Let the implementation live up to its documentation. We now also close fds if fd
passing is unavailable (!HAVE_SENDMSG) and when the connection is in an error
state.

(This also does sneak in some preparatory functions for follow-up commits and
thus does things in a more complicated way than really necessary.)

Signed-off-by: Uli Schlachter's avatarUli Schlachter <psychon@znc.in>
      25f9e7e4
  45. 30 May, 2015 2 commits