X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_in.c;h=76f970292a8d3baa2419238e6513880e130d3436;hb=53971ea183d9d1dcfbaec18b135e49c9c118fabb;hp=92bc0bf5ca4b9ed598bb0fb606808c82a62c202f;hpb=ff665b57266b9e7e9b9a366272c2115bbd516173;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_in.c b/src/xcb_in.c index 92bc0bf..76f9702 100644 --- a/src/xcb_in.c +++ b/src/xcb_in.c @@ -36,6 +36,9 @@ #include "xcbext.h" #include "xcbint.h" +#define XCBError 0 +#define XCBReply 1 + struct event_list { XCBGenericEvent *event; struct event_list *next; @@ -53,22 +56,17 @@ typedef struct pending_reply { struct pending_reply *next; } pending_reply; -typedef struct XCBReplyData { +typedef struct reader_list { unsigned int request; pthread_cond_t *data; -} XCBReplyData; - -static int match_reply(const void *request, const void *data) -{ - return ((XCBReplyData *) data)->request == *(unsigned int *) request; -} + struct reader_list *next; +} reader_list; static void wake_up_next_reader(XCBConnection *c) { - XCBReplyData *cur = _xcb_list_peek_head(c->in.readers); int pthreadret; - if(cur) - pthreadret = pthread_cond_signal(cur->data); + if(c->in.readers) + pthreadret = pthread_cond_signal(c->in.readers->data); else pthreadret = pthread_cond_signal(&c->in.event_cond); assert(pthreadret == 0); @@ -90,32 +88,39 @@ static int read_packet(XCBConnection *c) memcpy(&genrep, c->in.queue, sizeof(genrep)); /* Compute 32-bit sequence number of this packet. */ - if((genrep.response_type & 0x7f) != KeymapNotify) + if((genrep.response_type & 0x7f) != XCBKeymapNotify) { int lastread = c->in.request_read; c->in.request_read = (lastread & 0xffff0000) | genrep.sequence; + if(c->in.request_read < lastread) + c->in.request_read += 0x10000; + if(c->in.request_read > c->in.request_expected) + c->in.request_expected = c->in.request_read; + if(c->in.request_read != lastread) { - pending_reply *oldpend = c->in.pending_replies; - if(oldpend && oldpend->request == lastread) - { - c->in.pending_replies = oldpend->next; - if(!oldpend->next) - c->in.pending_replies_tail = &c->in.pending_replies; - free(oldpend); - } if(c->in.current_reply) { _xcb_map_put(c->in.replies, lastread, c->in.current_reply); c->in.current_reply = 0; c->in.current_reply_tail = &c->in.current_reply; } + c->in.request_completed = c->in.request_read - 1; + } + if(genrep.response_type != XCBReply) /* error or event */ + c->in.request_completed = c->in.request_read; /* XXX: does event/error imply no more replies? */ + + while(c->in.pending_replies && c->in.pending_replies->request <= c->in.request_completed) + { + pending_reply *oldpend = c->in.pending_replies; + c->in.pending_replies = oldpend->next; + if(!oldpend->next) + c->in.pending_replies_tail = &c->in.pending_replies; + free(oldpend); } - if(c->in.request_read < lastread) - c->in.request_read += 0x10000; } - if(genrep.response_type == 0 || genrep.response_type == 1) + if(genrep.response_type == XCBError || genrep.response_type == XCBReply) { pend = c->in.pending_replies; if(pend && pend->request != c->in.request_read) @@ -123,7 +128,7 @@ static int read_packet(XCBConnection *c) } /* For reply packets, check that the entire packet is available. */ - if(genrep.response_type == 1) + if(genrep.response_type == XCBReply) { if(pend && pend->workaround == WORKAROUND_GLX_GET_FB_CONFIGS_BUG) { @@ -133,7 +138,7 @@ static int read_packet(XCBConnection *c) length += genrep.length * 4; } - buf = malloc(length); + buf = malloc(length + (genrep.response_type == XCBReply ? 0 : sizeof(CARD32))); if(!buf) return 0; if(_xcb_in_read_block(c, buf, length) <= 0) @@ -141,11 +146,20 @@ static int read_packet(XCBConnection *c) free(buf); return 0; } + if(pend && (pend->flags & XCB_REQUEST_DISCARD_REPLY)) + { + free(buf); + return 1; + } + + if(genrep.response_type != XCBReply) + ((XCBGenericEvent *) buf)->full_sequence = c->in.request_read; /* reply, or checked error */ - if(genrep.response_type == 1 || (genrep.response_type == 0 && pend && (pend->flags & XCB_REQUEST_CHECKED))) + if( genrep.response_type == XCBReply || + (genrep.response_type == XCBError && pend && (pend->flags & XCB_REQUEST_CHECKED))) { - XCBReplyData *reader = _xcb_list_find(c->in.readers, match_reply, &c->in.request_read); + reader_list *reader; struct reply_list *cur = malloc(sizeof(struct reply_list)); if(!cur) return 0; @@ -153,8 +167,12 @@ static int read_packet(XCBConnection *c) cur->next = 0; *c->in.current_reply_tail = cur; c->in.current_reply_tail = &cur->next; - if(reader) - pthread_cond_signal(reader->data); + for(reader = c->in.readers; reader && reader->request <= c->in.request_read; reader = reader->next) + if(reader->request == c->in.request_read) + { + pthread_cond_signal(reader->data); + break; + } return 1; } @@ -211,7 +229,9 @@ static int read_block(const int fd, void *buf, const size_t len) fd_set fds; FD_ZERO(&fds); FD_SET(fd, &fds); - ret = select(fd + 1, &fds, 0, 0, 0); + do { + ret = select(fd + 1, &fds, 0, 0, 0); + } while (ret == -1 && errno == EINTR); } if(ret <= 0) return ret; @@ -224,30 +244,37 @@ static int read_block(const int fd, void *buf, const size_t len) void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **e) { pthread_cond_t cond = PTHREAD_COND_INITIALIZER; - XCBReplyData reader; + reader_list reader; + reader_list **prev_reader; struct reply_list *head; void *ret = 0; if(e) *e = 0; + /* If an error occurred when issuing the request, fail immediately. */ + if(!request) + return 0; + pthread_mutex_lock(&c->iolock); /* If this request has not been written yet, write it. */ - if((signed int) (c->out.request_written - request) < 0) - if(!_xcb_out_flush(c)) - goto done; /* error */ - - if(_xcb_list_find(c->in.readers, match_reply, &request)) + if(!_xcb_out_flush_to(c, request)) goto done; /* error */ + for(prev_reader = &c->in.readers; *prev_reader && (*prev_reader)->request <= request; prev_reader = &(*prev_reader)->next) + if((*prev_reader)->request == request) + goto done; /* error */ + reader.request = request; reader.data = &cond; - _xcb_list_append(c->in.readers, &reader); - - /* If this request has not been read yet, wait for it. */ - while(((signed int) (c->in.request_read - request) < 0 || - (c->in.request_read == request && !c->in.current_reply))) - if(!_xcb_conn_wait(c, /*should_write*/ 0, &cond)) + reader.next = *prev_reader; + *prev_reader = &reader; + + /* If this request has not completed yet and has no reply waiting, + * wait for one. */ + while(c->in.request_completed < request && + !(c->in.request_read == request && c->in.current_reply)) + if(!_xcb_conn_wait(c, &cond, 0, 0)) goto done; if(c->in.request_read != request) @@ -272,7 +299,7 @@ void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError ** ret = head->reply; free(head); - if(((XCBGenericRep *) ret)->response_type == 0) /* X error */ + if(((XCBGenericRep *) ret)->response_type == XCBError) { if(e) *e = ret; @@ -283,7 +310,12 @@ void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError ** } done: - _xcb_list_remove(c->in.readers, match_reply, &request); + for(prev_reader = &c->in.readers; *prev_reader && (*prev_reader)->request <= request; prev_reader = &(*prev_reader)->next) + if(*prev_reader == &reader) + { + *prev_reader = (*prev_reader)->next; + break; + } pthread_cond_destroy(&cond); wake_up_next_reader(c); @@ -302,7 +334,7 @@ XCBGenericEvent *XCBWaitForEvent(XCBConnection *c) pthread_mutex_lock(&c->iolock); /* get_event returns 0 on empty list. */ while(!(ret = get_event(c))) - if(!_xcb_conn_wait(c, /*should_write*/ 0, &c->in.event_cond)) + if(!_xcb_conn_wait(c, &c->in.event_cond, 0, 0)) break; wake_up_next_reader(c); @@ -352,10 +384,10 @@ int _xcb_in_init(_xcb_in *in) in->queue_len = 0; in->request_read = 0; + in->request_completed = 0; in->replies = _xcb_map_new(); - in->readers = _xcb_list_new(); - if(!in->replies || !in->readers) + if(!in->replies) return 0; in->current_reply_tail = &in->current_reply; @@ -370,7 +402,6 @@ void _xcb_in_destroy(_xcb_in *in) pthread_cond_destroy(&in->event_cond); free_reply_list(in->current_reply); _xcb_map_delete(in->replies, (void (*)(void *)) free_reply_list); - _xcb_list_delete(in->readers, 0); while(in->events) { struct event_list *e = in->events;