Attachment 290986 Details for Bug 427810 – deadlocks/ioerrors patch

[patch] deadlocks/ioerrors patch

libxcb.patch1 (text/plain), 1.86 KB, created by William P. Morrow on 2008-01-07 17:26:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William P. Morrow

Created: 2008-01-07 17:26:39 UTC

Size: 1.86 KB

patch

obsolete

>diff -urp libxcb-1.0.orig/src/xcb_conn.c libxcb-1.0/src/xcb_conn.c
>--- libxcb-1.0.orig/src/xcb_conn.c	2006-11-21 21:18:48.000000000 -0700
>+++ libxcb-1.0/src/xcb_conn.c	2008-01-05 10:40:34.000000000 -0700
>@@ -272,12 +272,14 @@ void _xcb_conn_shutdown(xcb_connection_t
> void _xcb_lock_io(xcb_connection_t *c)
> {
>     pthread_mutex_lock(&c->iolock);
>+#if 0
>     while(c->xlib.lock)
>     {
>         if(pthread_equal(c->xlib.thread, pthread_self()))
>             break;
>         pthread_cond_wait(&c->xlib.cond, &c->iolock);
>     }
>+#endif
> }
> 
> void _xcb_unlock_io(xcb_connection_t *c)
>diff -urp libxcb-1.0.orig/src/xcb_in.c libxcb-1.0/src/xcb_in.c
>--- libxcb-1.0.orig/src/xcb_in.c	2006-10-08 02:45:18.000000000 -0600
>+++ libxcb-1.0/src/xcb_in.c	2008-01-05 10:43:09.000000000 -0700
>@@ -119,8 +119,10 @@ static int read_packet(xcb_connection_t 
>             free(oldpend);
>         }
> 
>+#if 0
>         if(genrep.response_type == XCB_ERROR)
>             c->in.request_completed = c->in.request_read;
>+#endif
>     }
> 
>     if(genrep.response_type == XCB_ERROR || genrep.response_type == XCB_REPLY)
>@@ -161,9 +163,10 @@ static int read_packet(xcb_connection_t 
>     if(genrep.response_type != XCB_REPLY)
>         ((xcb_generic_event_t *) buf)->full_sequence = c->in.request_read;
> 
>-    /* reply, or checked error */
>+    /* reply, or error */
>     if( genrep.response_type == XCB_REPLY ||
>-       (genrep.response_type == XCB_ERROR && pend && (pend->flags & XCB_REQUEST_CHECKED)))
>+       (genrep.response_type == XCB_ERROR) )
>+       /* && pend && (pend->flags & XCB_REQUEST_CHECKED))) */
>     {
>         reader_list *reader;
>         struct reply_list *cur = malloc(sizeof(struct reply_list));
>@@ -190,7 +193,7 @@ static int read_packet(xcb_connection_t 
>         return 1;
>     }
> 
>-    /* event, or unchecked error */
>+    /* event */
>     event = malloc(sizeof(struct event_list));
>     if(!event)
>     {

Actions: View | Diff

Attachments on bug 427810: 290986