Attachment 67048 Details for Bug 54671 – Patch to keep Wine applications from locking up [v2]

[patch] Patch to keep Wine applications from locking up [v2]

tmp.diff (text/plain), 1.12 KB, created by Erich Hoover on 2012-09-12 11:53:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Erich Hoover

Created: 2012-09-12 11:53:18 UTC

Size: 1.12 KB

patch

obsolete

>diff --git a/src/xcb_conn.c b/src/xcb_conn.c
>index 7979491..08e7aad 100644
>--- a/src/xcb_conn.c
>+++ b/src/xcb_conn.c
>@@ -364,7 +364,7 @@ xcb_connection_t *_xcb_conn_ret_error(int err)
> 
> int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count)
> {
>-    int ret;
>+    int ret, already_reading;
> #if USE_POLL
>     struct pollfd fd;
> #else
>@@ -380,13 +380,21 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec
> 
> #if USE_POLL
>     memset(&fd, 0, sizeof(fd));
>-    fd.fd = c->fd;
>-    fd.events = POLLIN;
> #else
>     FD_ZERO(&rfds);
>-    FD_SET(c->fd, &rfds);
> #endif
>-    ++c->in.reading;
>+
>+    already_reading = c->in.reading;
>+    if(!already_reading)
>+    {
>+#if USE_POLL
>+        fd.fd = c->fd;
>+        fd.events = POLLIN;
>+#else
>+        FD_SET(c->fd, &rfds);
>+#endif
>+        ++c->in.reading;
>+    }
> 
> #if USE_POLL
>     if(count)
>@@ -444,7 +452,8 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec
> 
>     if(count)
>         --c->out.writing;
>-    --c->in.reading;
>+    if(!already_reading)
>+        --c->in.reading;
> 
>     return ret;
> }

Actions: View | Splinter Review

Attachments on bug 54671: 66895 | 66985 | 67004 | 67043 | 67048 | 67051 | 67053

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.