frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed poll_for_reply, added comments, and refactored XCBWaitForReply to call poll_for_reply.

This commit is contained in:
Jamey Sharp 2006-04-19 20:15:15 -07:00
parent 7667adbc63
commit d5ab03b4b7
1 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/xcb_in.c
View File

@ -243,23 +243,33 @@ static int poll_for_reply(XCBConnection *c, unsigned int request, void **reply,
{ {
struct reply_list *head; struct reply_list *head;
/* If an error occurred when issuing the request, fail immediately. */
if(!request) if(!request)
head = 0; head = 0;
else if(c->in.request_completed >= request) /* 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(request < c->in.request_read)
{ {
head = _xcb_map_remove(c->in.replies, request); head = _xcb_map_remove(c->in.replies, request);
if(head && head->next) if(head && head->next)
_xcb_map_put(c->in.replies, request, head->next); _xcb_map_put(c->in.replies, request, head->next);
} }
else if(c->in.request_read == request && c->in.current_reply) /* 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; head = c->in.current_reply;
c->in.current_reply = head->next; c->in.current_reply = head->next;
if(!head->next) if(!head->next)
c->in.current_reply_tail = &c->in.current_reply; 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 else
/* Would block: do nothing. */
return 0; return 0;
if(error) if(error)
@ -291,15 +301,10 @@ void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **
pthread_cond_t cond = PTHREAD_COND_INITIALIZER; pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
reader_list reader; reader_list reader;
reader_list **prev_reader; reader_list **prev_reader;
struct reply_list *head;
void *ret = 0; void *ret = 0;
if(e) if(e)
*e = 0; *e = 0;
/* If an error occurred when issuing the request, fail immediately. */
if(!request)
return 0;
pthread_mutex_lock(&c->iolock); pthread_mutex_lock(&c->iolock);
/* If this request has not been written yet, write it. */ /* If this request has not been written yet, write it. */
@ -317,43 +322,10 @@ void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **
/* If this request has not completed yet and has no reply waiting, /* If this request has not completed yet and has no reply waiting,
* wait for one. */ * wait for one. */
while(c->in.request_completed < request && while(!poll_for_reply(c, request, &ret, e))
!(c->in.request_read == request && c->in.current_reply))
if(!_xcb_conn_wait(c, &cond, 0, 0)) if(!_xcb_conn_wait(c, &cond, 0, 0))
goto done; goto done;
if(c->in.request_read != request)
{
head = _xcb_map_remove(c->in.replies, request);
if(head && head->next)
_xcb_map_put(c->in.replies, request, head->next);
}
else
{
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;
}
}
if(head)
{
ret = head->reply;
free(head);
if(((XCBGenericRep *) ret)->response_type == XCBError)
{
if(e)
*e = ret;
else
free(ret);
ret = 0;
}
}
done: done:
for(prev_reader = &c->in.readers; *prev_reader && (*prev_reader)->request <= request; prev_reader = &(*prev_reader)->next) for(prev_reader = &c->in.readers; *prev_reader && (*prev_reader)->request <= request; prev_reader = &(*prev_reader)->next)
if(*prev_reader == &reader) if(*prev_reader == &reader)