X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_in.c;h=d8b608aa09eb6ec165e06bd7ee35f75f1d7d27e7;hb=79e3227022ae3d66f9f3806d231fdeec2a06cc6b;hp=fa13e90b27a2454a92895c535d2fa6277269438c;hpb=d8de2c7c2a9b8bf59c8f1fcece5faed0b6cbf6f4;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_in.c b/src/xcb_in.c index fa13e90..d8b608a 100644 --- a/src/xcb_in.c +++ b/src/xcb_in.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include "xcb.h" @@ -90,11 +91,11 @@ static int read_packet(XCBConnection *c) /* Compute 32-bit sequence number of this packet. */ if((genrep.response_type & 0x7f) != XCBKeymapNotify) { - int lastread = c->in.request_read; + unsigned int lastread = c->in.request_read; c->in.request_read = (lastread & 0xffff0000) | genrep.sequence; - if(c->in.request_read < lastread) + if(XCB_SEQUENCE_COMPARE(c->in.request_read, <, lastread)) c->in.request_read += 0x10000; - if(c->in.request_read > c->in.request_expected) + if(XCB_SEQUENCE_COMPARE(c->in.request_read, >, c->in.request_expected)) c->in.request_expected = c->in.request_read; if(c->in.request_read != lastread) @@ -107,10 +108,11 @@ static int read_packet(XCBConnection *c) } 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? */ + if(genrep.response_type == XCBError) + c->in.request_completed = c->in.request_read; - while(c->in.pending_replies && c->in.pending_replies->request <= c->in.request_completed) + while(c->in.pending_replies && + XCB_SEQUENCE_COMPARE (c->in.pending_replies->request, <=, c->in.request_completed)) { pending_reply *oldpend = c->in.pending_replies; c->in.pending_replies = oldpend->next; @@ -167,12 +169,17 @@ static int read_packet(XCBConnection *c) cur->next = 0; *c->in.current_reply_tail = cur; c->in.current_reply_tail = &cur->next; - for(reader = c->in.readers; reader && reader->request <= c->in.request_read; reader = reader->next) + for(reader = c->in.readers; + reader && + XCB_SEQUENCE_COMPARE(reader->request, <=, c->in.request_read); + reader = reader->next) + { if(reader->request == c->in.request_read) { pthread_cond_signal(reader->data); break; } + } return 1; } @@ -229,7 +236,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; @@ -237,98 +246,137 @@ static int read_block(const int fd, void *buf, const size_t len) return len; } -/* Public interface */ - -void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **e) +static int poll_for_reply(XCBConnection *c, unsigned int request, void **reply, XCBGenericError **error) { - pthread_cond_t cond = PTHREAD_COND_INITIALIZER; - 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(!_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; - 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) + head = 0; + /* We've read requests past the one we want, so if it has replies we have + * them all and they're in the replies map. */ + else if(XCB_SEQUENCE_COMPARE(request, <, c->in.request_read)) { head = _xcb_map_remove(c->in.replies, request); if(head && head->next) _xcb_map_put(c->in.replies, request, head->next); } - else + /* We're currently processing the responses to the request we want, and we + * have a reply ready to return. So just return it without blocking. */ + else if(request == c->in.request_read && c->in.current_reply) { head = c->in.current_reply; - if(head) - { - c->in.current_reply = head->next; - if(!head->next) - c->in.current_reply_tail = &c->in.current_reply; - } + c->in.current_reply = head->next; + if(!head->next) + c->in.current_reply_tail = &c->in.current_reply; } + /* We know this request can't have any more replies, and we've already + * established it doesn't have a reply now. Don't bother blocking. */ + else if(request == c->in.request_completed) + head = 0; + /* We may have more replies on the way for this request: block until we're + * sure. */ + else + return 0; + + if(error) + *error = 0; + *reply = 0; if(head) { - ret = head->reply; - free(head); - - if(((XCBGenericRep *) ret)->response_type == XCBError) + if(((XCBGenericRep *) head->reply)->response_type == XCBError) { - if(e) - *e = ret; + if(error) + *error = head->reply; else - free(ret); - ret = 0; + free(head->reply); } + else + *reply = head->reply; + + free(head); } -done: - 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); + return 1; +} + +/* Public interface */ + +void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **e) +{ + void *ret = 0; + if(e) + *e = 0; + if(c->has_error) + return 0; + + pthread_mutex_lock(&c->iolock); + + /* If this request has not been written yet, write it. */ + if(_xcb_out_flush_to(c, request)) + { + pthread_cond_t cond = PTHREAD_COND_INITIALIZER; + reader_list reader; + reader_list **prev_reader; + + for(prev_reader = &c->in.readers; + *prev_reader && + XCB_SEQUENCE_COMPARE ((*prev_reader)->request, <=, request); + prev_reader = &(*prev_reader)->next) + { + /* empty */; + } + reader.request = request; + reader.data = &cond; + reader.next = *prev_reader; + *prev_reader = &reader; + + while(!poll_for_reply(c, request, &ret, e)) + if(!_xcb_conn_wait(c, &cond, 0, 0)) + break; + + for(prev_reader = &c->in.readers; + *prev_reader && + XCB_SEQUENCE_COMPARE((*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); pthread_mutex_unlock(&c->iolock); return ret; } -XCBGenericEvent *XCBWaitEvent(XCBConnection *c) +int XCBPollForReply(XCBConnection *c, unsigned int request, void **reply, XCBGenericError **error) { - return XCBWaitForEvent(c); + int ret; + if(c->has_error) + { + *reply = 0; + if(error) + *error = 0; + return 1; /* would not block */ + } + assert(reply != 0); + pthread_mutex_lock(&c->iolock); + ret = poll_for_reply(c, request, reply, error); + pthread_mutex_unlock(&c->iolock); + return ret; } XCBGenericEvent *XCBWaitForEvent(XCBConnection *c) { XCBGenericEvent *ret; + if(c->has_error) + return 0; pthread_mutex_lock(&c->iolock); /* get_event returns 0 on empty list. */ while(!(ret = get_event(c))) @@ -342,32 +390,50 @@ XCBGenericEvent *XCBWaitForEvent(XCBConnection *c) XCBGenericEvent *XCBPollForEvent(XCBConnection *c, int *error) { - XCBGenericEvent *ret = 0; - pthread_mutex_lock(&c->iolock); + if(!c->has_error) + { + XCBGenericEvent *ret = 0; + int success; + pthread_mutex_lock(&c->iolock); + /* FIXME: follow X meets Z architecture changes. */ + success = _xcb_in_read(c); + if(success) + ret = get_event(c); + pthread_mutex_unlock(&c->iolock); + if(success) + { + if(error) + *error = 0; + return ret; + } + } if(error) - *error = 0; - /* FIXME: follow X meets Z architecture changes. */ - if(_xcb_in_read(c)) - ret = get_event(c); - else if(error) *error = -1; else { fprintf(stderr, "XCBPollForEvent: I/O error occured, but no handler provided.\n"); abort(); } - pthread_mutex_unlock(&c->iolock); - return ret; + return 0; } -unsigned int XCBGetRequestRead(XCBConnection *c) +XCBGenericError *XCBRequestCheck(XCBConnection *c, XCBVoidCookie cookie) { - unsigned int ret; - pthread_mutex_lock(&c->iolock); - /* FIXME: follow X meets Z architecture changes. */ - _xcb_in_read(c); - ret = c->in.request_read; - pthread_mutex_unlock(&c->iolock); + /* FIXME: this could hold the lock to avoid syncing unnecessarily, but + * that would require factoring the locking out of XCBGetInputFocus, + * XCBGetInputFocusReply, and XCBWaitForReply. */ + XCBGenericError *ret; + void *reply; + if(c->has_error) + return 0; + if(XCB_SEQUENCE_COMPARE(cookie.sequence,>,c->in.request_expected) + && XCB_SEQUENCE_COMPARE(cookie.sequence,>,c->in.request_completed)) + { + free(XCBGetInputFocusReply(c, XCBGetInputFocus(c), &ret)); + assert(!ret); + } + reply = XCBWaitForReply(c, cookie.sequence, &ret); + assert(!reply); return ret; } @@ -417,18 +483,16 @@ void _xcb_in_destroy(_xcb_in *in) int _xcb_in_expect_reply(XCBConnection *c, unsigned int request, enum workarounds workaround, int flags) { - if(workaround != WORKAROUND_NONE || flags != 0) - { - pending_reply *pend = malloc(sizeof(pending_reply)); - if(!pend) - return 0; - pend->request = request; - pend->workaround = workaround; - pend->flags = flags; - pend->next = 0; - *c->in.pending_replies_tail = pend; - c->in.pending_replies_tail = &pend->next; - } + pending_reply *pend = malloc(sizeof(pending_reply)); + assert(workaround != WORKAROUND_NONE || flags != 0); + if(!pend) + return 0; + pend->request = request; + pend->workaround = workaround; + pend->flags = flags; + pend->next = 0; + *c->in.pending_replies_tail = pend; + c->in.pending_replies_tail = &pend->next; return 1; }