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

Separate notion of request-completed from current-request, and mark requests completed more aggressively. Detects some usage errors that are otherwise undetectable.

This commit is contained in:
Jamey Sharp 2006-03-02 13:49:00 -08:00
parent c05ae15b66
commit ed823bf651
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/xcb_in.c
View File

@ -89,9 +89,23 @@ static int read_packet(XCBConnection *c)
{ {
int lastread = c->in.request_read; int lastread = c->in.request_read;
c->in.request_read = (lastread & 0xffff0000) | genrep.sequence; c->in.request_read = (lastread & 0xffff0000) | genrep.sequence;
if(c->in.request_read < lastread)
c->in.request_read += 0x10000;
if(c->in.request_read != lastread) if(c->in.request_read != lastread)
{ {
while(c->in.pending_replies && c->in.pending_replies->request < c->in.request_read) 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 != 1) /* not reply: 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; pending_reply *oldpend = c->in.pending_replies;
c->in.pending_replies = oldpend->next; c->in.pending_replies = oldpend->next;
@ -99,15 +113,6 @@ static int read_packet(XCBConnection *c)
c->in.pending_replies_tail = &c->in.pending_replies; c->in.pending_replies_tail = &c->in.pending_replies;
free(oldpend); 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;
}
}
if(c->in.request_read < lastread)
c->in.request_read += 0x10000;
} }
if(genrep.response_type == 0 || genrep.response_type == 1) if(genrep.response_type == 0 || genrep.response_type == 1)
@ -246,9 +251,10 @@ void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **
reader.next = *prev_reader; reader.next = *prev_reader;
*prev_reader = &reader; *prev_reader = &reader;
/* If this request has not been read yet, wait for it. */ /* If this request has not completed yet and has no reply waiting,
while(((signed int) (c->in.request_read - request) < 0 || * wait for one. */
(c->in.request_read == request && !c->in.current_reply))) while(c->in.request_completed < request &&
!(c->in.request_read == request && c->in.current_reply))
if(!_xcb_conn_wait(c, /*should_write*/ 0, &cond)) if(!_xcb_conn_wait(c, /*should_write*/ 0, &cond))
goto done; goto done;
@ -359,6 +365,7 @@ int _xcb_in_init(_xcb_in *in)
in->queue_len = 0; in->queue_len = 0;
in->request_read = 0; in->request_read = 0;
in->request_completed = 0;
in->replies = _xcb_map_new(); in->replies = _xcb_map_new();
if(!in->replies) if(!in->replies)

1
src/xcbint.h
View File

@ -87,6 +87,7 @@ typedef struct _xcb_in {
int queue_len; int queue_len;
unsigned int request_read; unsigned int request_read;
unsigned int request_completed;
struct reply_list *current_reply; struct reply_list *current_reply;
struct reply_list **current_reply_tail; struct reply_list **current_reply_tail;