#include "xcbext.h"
#include "xcbint.h"
+#define XCBError 0
+#define XCBReply 1
+
struct event_list {
XCBGenericEvent *event;
struct event_list *next;
};
+struct reply_list {
+ void *reply;
+ struct reply_list *next;
+};
+
typedef struct pending_reply {
unsigned int request;
enum workarounds workaround;
struct pending_reply *next;
} pending_reply;
-typedef struct XCBReplyData {
+typedef struct reader_list {
unsigned int request;
- void *data;
-} XCBReplyData;
-
-static int match_reply(const void *request, const void *data)
-{
- return ((XCBReplyData *) data)->request == *(unsigned int *) request;
-}
+ pthread_cond_t *data;
+ 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);
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(!_xcb_queue_is_empty(c->in.current_reply))
+ if(c->in.current_reply)
{
_xcb_map_put(c->in.replies, lastread, c->in.current_reply);
- c->in.current_reply = _xcb_queue_new();
+ 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)
}
/* 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)
{
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)
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);
- _xcb_queue_enqueue(c->in.current_reply, buf);
- if(reader)
- pthread_cond_signal(reader->data);
+ reader_list *reader;
+ struct reply_list *cur = malloc(sizeof(struct reply_list));
+ if(!cur)
+ return 0;
+ cur->reply = buf;
+ 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)
+ if(reader->request == c->in.request_read)
+ {
+ pthread_cond_signal(reader->data);
+ break;
+ }
return 1;
}
return ret;
}
+static void free_reply_list(struct reply_list *head)
+{
+ while(head)
+ {
+ struct reply_list *cur = head;
+ head = cur->next;
+ free(cur->reply);
+ free(cur);
+ }
+}
+
static int read_block(const int fd, void *buf, const size_t len)
{
int done = 0;
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 &&
- _xcb_queue_is_empty(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)
{
- _xcb_queue *q = _xcb_map_get(c->in.replies, request);
- if(q)
+ 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)
{
- ret = _xcb_queue_dequeue(q);
- if(_xcb_queue_is_empty(q))
- _xcb_queue_delete(_xcb_map_remove(c->in.replies, request), free);
+ c->in.current_reply = head->next;
+ if(!head->next)
+ c->in.current_reply_tail = &c->in.current_reply;
}
}
- else
- ret = _xcb_queue_dequeue(c->in.current_reply);
- if(ret && ((XCBGenericRep *) ret)->response_type == 0) /* X error */
+ if(head)
{
- if(e)
- *e = ret;
- else
- free(ret);
- ret = 0;
+ ret = head->reply;
+ free(head);
+
+ if(((XCBGenericRep *) ret)->response_type == XCBError)
+ {
+ if(e)
+ *e = ret;
+ else
+ free(ret);
+ ret = 0;
+ }
}
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);
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);
in->queue_len = 0;
in->request_read = 0;
- in->current_reply = _xcb_queue_new();
+ in->request_completed = 0;
in->replies = _xcb_map_new();
- in->readers = _xcb_list_new();
- if(!in->current_reply || !in->replies || !in->readers)
+ if(!in->replies)
return 0;
+ in->current_reply_tail = &in->current_reply;
in->events_tail = &in->events;
in->pending_replies_tail = &in->pending_replies;
void _xcb_in_destroy(_xcb_in *in)
{
pthread_cond_destroy(&in->event_cond);
- _xcb_queue_delete(in->current_reply, free);
- _xcb_map_delete(in->replies, free);
- _xcb_list_delete(in->readers, 0);
+ free_reply_list(in->current_reply);
+ _xcb_map_delete(in->replies, (void (*)(void *)) free_reply_list);
while(in->events)
{
struct event_list *e = in->events;
projects / free-sw / xcb / libxcb / blobdiff