#include "xcbext.h"
#include "xcbint.h"
+#define XCBError 0
+#define XCBReply 1
+
struct event_list {
XCBGenericEvent *event;
struct event_list *next;
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)
{
}
c->in.request_completed = c->in.request_read - 1;
}
- if(genrep.response_type != 1) /* not reply: error or event */
+ 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)
}
}
- 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 + (genrep.response_type == 1 ? 0 : sizeof(CARD32)));
+ 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 != 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)))
{
reader_list *reader;
struct reply_list *cur = malloc(sizeof(struct reply_list));
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;
return len;
}
+static int poll_for_reply(XCBConnection *c, unsigned int request, void **reply, XCBGenericError **error)
+{
+ struct reply_list *head;
+
+ /* If an error occurred when issuing the request, fail immediately. */
+ if(!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(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);
+ }
+ /* 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;
+ 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)
+ {
+ if(((XCBGenericRep *) head->reply)->response_type == XCBError)
+ {
+ if(error)
+ *error = head->reply;
+ else
+ free(head->reply);
+ }
+ else
+ *reply = head->reply;
+
+ free(head);
+ }
+
+ return 1;
+}
+
/* Public interface */
void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **e)
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((signed int) (c->out.request_written - request) < 0)
- if(!_xcb_out_flush(c))
- goto done; /* error */
+ 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)
/* 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, /*should_write*/ 0, &cond))
+ while(!poll_for_reply(c, request, &ret, e))
+ if(!_xcb_conn_wait(c, &cond, 0, 0))
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 == 0) /* X error */
- {
- if(e)
- *e = ret;
- else
- free(ret);
- ret = 0;
- }
- }
-
done:
for(prev_reader = &c->in.readers; *prev_reader && (*prev_reader)->request <= request; prev_reader = &(*prev_reader)->next)
if(*prev_reader == &reader)
return ret;
}
+int XCBPollForReply(XCBConnection *c, unsigned int request, void **reply, XCBGenericError **error)
+{
+ int ret;
+ assert(reply != 0);
+ pthread_mutex_lock(&c->iolock);
+ ret = poll_for_reply(c, request, reply, error);
+ pthread_mutex_unlock(&c->iolock);
+ return ret;
+}
+
XCBGenericEvent *XCBWaitEvent(XCBConnection *c)
{
return XCBWaitForEvent(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);
projects / free-sw / xcb / libxcb / blobdiff