#include <assert.h>
#include <string.h>
#include <stdlib.h>
+#include <unistd.h>
#include <stdio.h>
#include <errno.h>
#include "xcbext.h"
#include "xcbint.h"
-typedef struct {
+typedef struct pending_reply {
unsigned int request;
enum workarounds workaround;
+ struct pending_reply *next;
} pending_reply;
typedef struct XCBReplyData {
assert(pthreadret == 0);
}
+static int read_packet(XCBConnection *c)
+{
+ XCBGenericRep genrep;
+ int length = 32;
+ unsigned char *buf;
+
+ /* Wait for there to be enough data for us to read a whole packet */
+ if(c->in.queue_len < length)
+ return 0;
+
+ /* Get the response type, length, and sequence number. */
+ memcpy(&genrep, c->in.queue, sizeof(genrep));
+
+ /* Compute 32-bit sequence number of this packet. */
+ if((genrep.response_type & 0x7f) != KeymapNotify)
+ {
+ int lastread = c->in.request_read;
+ c->in.request_read = (lastread & 0xffff0000) | genrep.sequence;
+ if(c->in.request_read != lastread && !_xcb_queue_is_empty(c->in.current_reply))
+ {
+ _xcb_map_put(c->in.replies, lastread, c->in.current_reply);
+ c->in.current_reply = _xcb_queue_new();
+ }
+ if(c->in.request_read < lastread)
+ c->in.request_read += 0x10000;
+ }
+
+ /* For reply packets, check that the entire packet is available. */
+ if(genrep.response_type == 1)
+ {
+ pending_reply *pend = c->in.pending_replies;
+ if(pend && pend->request == c->in.request_read)
+ {
+ switch(pend->workaround)
+ {
+ case WORKAROUND_NONE:
+ break;
+ case WORKAROUND_GLX_GET_FB_CONFIGS_BUG:
+ {
+ CARD32 *p = (CARD32 *) c->in.queue;
+ genrep.length = p[2] * p[3] * 2;
+ }
+ break;
+ }
+ c->in.pending_replies = pend->next;
+ if(!pend->next)
+ c->in.pending_replies_tail = &c->in.pending_replies;
+ free(pend);
+ }
+ length += genrep.length * 4;
+ }
+
+ buf = malloc(length);
+ if(!buf)
+ return 0;
+ if(_xcb_in_read_block(c, buf, length) <= 0)
+ {
+ free(buf);
+ return 0;
+ }
+
+ if(buf[0] == 1) /* response is a reply */
+ {
+ 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);
+ return 1;
+ }
+
+ if(buf[0] == 0) /* response is an error */
+ {
+ XCBReplyData *reader = _xcb_list_find(c->in.readers, match_reply, &c->in.request_read);
+ if(reader && reader->error)
+ {
+ *reader->error = (XCBGenericError *) buf;
+ pthread_cond_signal(reader->data);
+ return 1;
+ }
+ }
+
+ /* event, or error without a waiting reader */
+ _xcb_queue_enqueue(c->in.events, buf);
+ pthread_cond_signal(&c->in.event_cond);
+ return 1; /* I have something for you... */
+}
+
+static int read_block(const int fd, void *buf, const size_t len)
+{
+ int done = 0;
+ while(done < len)
+ {
+ int ret = read(fd, ((char *) buf) + done, len - done);
+ if(ret > 0)
+ done += ret;
+ if(ret < 0 && errno == EAGAIN)
+ {
+ fd_set fds;
+ FD_ZERO(&fds);
+ FD_SET(fd, &fds);
+ ret = select(fd + 1, &fds, 0, 0, 0);
+ }
+ if(ret <= 0)
+ return ret;
+ }
+ return len;
+}
+
/* Public interface */
void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **e)
XCBGenericEvent *XCBWaitForEvent(XCBConnection *c)
{
XCBGenericEvent *ret;
-
-#if XCBTRACEEVENT
- fprintf(stderr, "Entering XCBWaitEvent\n");
-#endif
-
pthread_mutex_lock(&c->iolock);
/* _xcb_list_remove_head returns 0 on empty list. */
while(!(ret = _xcb_queue_dequeue(c->in.events)))
wake_up_next_reader(c);
pthread_mutex_unlock(&c->iolock);
-
-#if XCBTRACEEVENT
- fprintf(stderr, "Leaving XCBWaitEvent, event type %d\n", ret ? ret->response_type : -1);
-#endif
-
return ret;
}
if(error)
*error = 0;
/* FIXME: follow X meets Z architecture changes. */
- if(_xcb_in_read(c) >= 0)
+ if(_xcb_in_read(c))
ret = _xcb_queue_dequeue(c->in.events);
else if(error)
*error = -1;
in->replies = _xcb_map_new();
in->events = _xcb_queue_new();
in->readers = _xcb_list_new();
-
- in->pending_replies = _xcb_queue_new();
- if(!in->current_reply || !in->replies || !in->events || !in->readers || !in->pending_replies)
+ if(!in->current_reply || !in->replies || !in->events || !in->readers)
return 0;
+ in->pending_replies_tail = &in->pending_replies;
+
return 1;
}
_xcb_map_delete(in->replies, free);
_xcb_queue_delete(in->events, free);
_xcb_list_delete(in->readers, 0);
- _xcb_queue_delete(in->pending_replies, free);
+ while(in->pending_replies)
+ {
+ pending_reply *pend = in->pending_replies;
+ in->pending_replies = pend->next;
+ free(pend);
+ }
}
int _xcb_in_expect_reply(XCBConnection *c, unsigned int request, enum workarounds workaround)
return 0;
pend->request = request;
pend->workaround = workaround;
- if(!_xcb_queue_enqueue(c->in.pending_replies, pend))
- {
- free(pend);
- return 0;
- }
+ pend->next = 0;
+ *c->in.pending_replies_tail = pend;
+ c->in.pending_replies_tail = &pend->next;
}
return 1;
}
-int _xcb_in_read_packet(XCBConnection *c)
-{
- XCBGenericRep genrep;
- int length = 32;
- unsigned char *buf;
-
- /* Wait for there to be enough data for us to read a whole packet */
- if(c->in.queue_len < length)
- return 0;
-
- /* Get the response type, length, and sequence number. */
- memcpy(&genrep, c->in.queue, sizeof(genrep));
-
- /* Compute 32-bit sequence number of this packet. */
- if((genrep.response_type & 0x7f) != KeymapNotify)
- {
- int lastread = c->in.request_read;
- c->in.request_read = (lastread & 0xffff0000) | genrep.sequence;
- if(c->in.request_read != lastread && !_xcb_queue_is_empty(c->in.current_reply))
- {
- _xcb_map_put(c->in.replies, lastread, c->in.current_reply);
- c->in.current_reply = _xcb_queue_new();
- }
- if(c->in.request_read < lastread)
- c->in.request_read += 0x10000;
- }
-
- /* For reply packets, check that the entire packet is available. */
- if(genrep.response_type == 1)
- {
- pending_reply *pend = _xcb_list_peek_head(c->in.pending_replies);
- if(pend && pend->request == c->in.request_read)
- {
- switch(pend->workaround)
- {
- case WORKAROUND_NONE:
- break;
- case WORKAROUND_GLX_GET_FB_CONFIGS_BUG:
- {
- CARD32 *p = (CARD32 *) c->in.queue;
- genrep.length = p[2] * p[3] * 2;
- }
- break;
- }
- free(_xcb_queue_dequeue(c->in.pending_replies));
- }
- length += genrep.length * 4;
- }
-
- buf = malloc(length);
- if(!buf)
- return 0;
- if(_xcb_in_read_block(c, buf, length) <= 0)
- {
- free(buf);
- return 0;
- }
-
- if(buf[0] == 1) /* response is a reply */
- {
- 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);
- return 1;
- }
-
- if(buf[0] == 0) /* response is an error */
- {
- XCBReplyData *reader = _xcb_list_find(c->in.readers, match_reply, &c->in.request_read);
- if(reader && reader->error)
- {
- *reader->error = (XCBGenericError *) buf;
- pthread_cond_signal(reader->data);
- return 1;
- }
- }
-
- /* event, or error without a waiting reader */
- _xcb_queue_enqueue(c->in.events, buf);
- pthread_cond_signal(&c->in.event_cond);
- return 1; /* I have something for you... */
-}
-
int _xcb_in_read(XCBConnection *c)
{
- int n = _xcb_readn(c->fd, c->in.queue, sizeof(c->in.queue), &c->in.queue_len);
- if(n < 0 && errno == EAGAIN)
- n = 1;
- while(_xcb_in_read_packet(c) > 0)
+ int n = read(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len);
+ if(n > 0)
+ c->in.queue_len += n;
+ while(read_packet(c))
/* empty */;
- return n;
+ return (n > 0) || (n < 0 && errno == EAGAIN);
}
int _xcb_in_read_block(XCBConnection *c, void *buf, int len)
if(len > done)
{
- int ret = _xcb_read_block(c->fd, (char *) buf + done, len - done);
+ int ret = read_block(c->fd, (char *) buf + done, len - done);
if(ret <= 0)
return ret;
}