Attachment 53997 Details for Bug 29875 – Keep flushing when transfering socket to Xlib

[patch] Keep flushing when transfering socket to Xlib

0001-Make-xcb_take_socket-keep-flushing-until-idle.patch (text/plain), 1.31 KB, created by Keith Packard on 2011-12-01 02:58:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Packard

Created: 2011-12-01 02:58:03 UTC

Size: 1.31 KB

patch

obsolete

>From 0297a46f008186a56826f5a2c7621dd7b4b69718 Mon Sep 17 00:00:00 2001
>From: Keith Packard <keithp@keithp.com>
>Date: Thu, 1 Dec 2011 10:28:51 +0000
>Subject: [PATCH] Make xcb_take_socket keep flushing until idle
>
>_xcb_out_flush_to will drop the iolock in pthread_cond_wait allowing
>other threads to queue new requests. When this happened,
>there would be requests queued for the socket after _xcb_out_flush_to
>returned, and xcb_take_socket would throw an assert.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=29875
>Signed-off-by: Keith Packard <keithp@keithp.com>
>---
> src/xcb_out.c |    8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)
>
>diff --git a/src/xcb_out.c b/src/xcb_out.c
>index 5eb1e42..d6082fc 100644
>--- a/src/xcb_out.c
>+++ b/src/xcb_out.c
>@@ -263,7 +263,13 @@ int xcb_take_socket(xcb_connection_t *c, void (*return_socket)(void *closure), v
>         return 0;
>     pthread_mutex_lock(&c->iolock);
>     get_socket_back(c);
>-    ret = _xcb_out_flush_to(c, c->out.request);
>+
>+    /* _xcb_out_flush may drop the iolock allowing other threads to
>+     * write requests, so keep flushing until we're done
>+     */
>+    do
>+	    ret = _xcb_out_flush_to(c, c->out.request);
>+    while (ret && c->out.request != c->out.request_written);
>     if(ret)
>     {
>         c->out.return_socket = return_socket;
>-- 
>1.7.7.3
>

Actions: View | Splinter Review

Attachments on bug 29875: 53997

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.