X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_in.c;h=3bf54f3b8f27c40a0a38a2335b5902ebd94e7a5a;hb=2a18842f0f93516ff726a2dfa44348410bb55626;hp=973a0d2fe097da5e2cdeca301492c672d9bd7bc2;hpb=29f9fe0fc805a1ec6860f167a45664cc1cf0c769;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_in.c b/src/xcb_in.c
index 973a0d2..3bf54f3 100644
--- a/src/xcb_in.c
+++ b/src/xcb_in.c
@@ -30,12 +30,16 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <sys/select.h>
 #include <errno.h>
 
 #include "xcb.h"
 #include "xcbext.h"
 #include "xcbint.h"
 
+#define XCBError 0
+#define XCBReply 1
+
 struct event_list {
     XCBGenericEvent *event;
     struct event_list *next;
@@ -85,12 +89,14 @@ static int read_packet(XCBConnection *c)
     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)
         {
@@ -102,7 +108,7 @@ static int read_packet(XCBConnection *c)
             }
             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)
@@ -115,7 +121,7 @@ static int read_packet(XCBConnection *c)
         }
     }
 
-    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)
@@ -123,7 +129,7 @@ static int read_packet(XCBConnection *c)
     }
 
     /* 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)
         {
@@ -133,7 +139,7 @@ static int read_packet(XCBConnection *c)
         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)
@@ -141,12 +147,18 @@ static int read_packet(XCBConnection *c)
         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));
@@ -218,7 +230,9 @@ static int read_block(const int fd, void *buf, const size_t len)
             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;
@@ -226,91 +240,113 @@ static int read_block(const int fd, void *buf, const size_t len)
     return len;
 }
 
-/* Public interface */
-
-void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **e)
+static int poll_for_reply(XCBConnection *c, unsigned int request, void **reply, XCBGenericError **error)
 {
-    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 */
-
-    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;
-    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, /*should_write*/ 0, &cond))
-            goto done;
-
-    if(c->in.request_read != 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);
     }
-    else
+    /* 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;
-        if(head)
-        {
-            c->in.current_reply = head->next;
-            if(!head->next)
-                c->in.current_reply_tail = &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)
     {
-        ret = head->reply;
-        free(head);
-
-        if(((XCBGenericRep *) ret)->response_type == 0) /* X error */
+        if(((XCBGenericRep *) head->reply)->response_type == XCBError)
         {
-            if(e)
-                *e = ret;
+            if(error)
+                *error = head->reply;
             else
-                free(ret);
-            ret = 0;
+                free(head->reply);
         }
+        else
+            *reply = head->reply;
+
+        free(head);
     }
 
-done:
-    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);
+    return 1;
+}
+
+/* Public interface */
+
+void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **e)
+{
+    void *ret = 0;
+    if(e)
+        *e = 0;
+
+    pthread_mutex_lock(&c->iolock);
+
+    /* If this request has not been written yet, write it. */
+    if(_xcb_out_flush_to(c, request))
+    {
+        pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+        reader_list reader;
+        reader_list **prev_reader;
+
+        for(prev_reader = &c->in.readers; *prev_reader && (*prev_reader)->request <= request; prev_reader = &(*prev_reader)->next)
+            /* empty */;
+        reader.request = request;
+        reader.data = &cond;
+        reader.next = *prev_reader;
+        *prev_reader = &reader;
+
+        while(!poll_for_reply(c, request, &ret, e))
+            if(!_xcb_conn_wait(c, &cond, 0, 0))
+                break;
+
+        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_unlock(&c->iolock);
     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);
@@ -322,7 +358,7 @@ XCBGenericEvent *XCBWaitForEvent(XCBConnection *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);
@@ -407,18 +443,16 @@ void _xcb_in_destroy(_xcb_in *in)
 
 int _xcb_in_expect_reply(XCBConnection *c, unsigned int request, enum workarounds workaround, int flags)
 {
-    if(workaround != WORKAROUND_NONE || flags != 0)
-    {
-        pending_reply *pend = malloc(sizeof(pending_reply));
-        if(!pend)
-            return 0;
-        pend->request = request;
-        pend->workaround = workaround;
-        pend->flags = flags;
-        pend->next = 0;
-        *c->in.pending_replies_tail = pend;
-        c->in.pending_replies_tail = &pend->next;
-    }
+    pending_reply *pend = malloc(sizeof(pending_reply));
+    assert(workaround != WORKAROUND_NONE || flags != 0);
+    if(!pend)
+        return 0;
+    pend->request = request;
+    pend->workaround = workaround;
+    pend->flags = flags;
+    pend->next = 0;
+    *c->in.pending_replies_tail = pend;
+    c->in.pending_replies_tail = &pend->next;
     return 1;
 }