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

diff --git a/src/xcb_in.c b/src/xcb_in.c
index c260b7b..3bf54f3 100644
--- a/src/xcb_in.c
+++ b/src/xcb_in.c
@@ -28,102 +28,325 @@
 #include <assert.h>
 #include <string.h>
 #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"
 
-typedef struct XCBReplyData {
-    unsigned int request;
-    void *data;
-    XCBGenericError **error;
-} XCBReplyData;
+#define XCBError 0
+#define XCBReply 1
 
-static int match_request_error(const void *request, const void *data)
-{
-    const XCBGenericError *e = data;
-    return e->response_type == 0 && e->sequence == ((*(unsigned int *) request) & 0xffff);
-}
+struct event_list {
+    XCBGenericEvent *event;
+    struct event_list *next;
+};
 
-static int match_reply(const void *request, const void *data)
-{
-    return ((XCBReplyData *) data)->request == *(unsigned int *) request;
-}
+struct reply_list {
+    void *reply;
+    struct reply_list *next;
+};
+
+typedef struct pending_reply {
+    unsigned int request;
+    enum workarounds workaround;
+    int flags;
+    struct pending_reply *next;
+} pending_reply;
+
+typedef struct reader_list {
+    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);
 }
 
-/* Public interface */
-
-void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError **e)
+static int read_packet(XCBConnection *c)
 {
-    pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-    XCBReplyData reader;
-    void *ret = 0;
-    if(e)
-        *e = 0;
+    XCBGenericRep genrep;
+    int length = 32;
+    void *buf;
+    pending_reply *pend = 0;
+    struct event_list *event;
 
-    pthread_mutex_lock(&c->iolock);
+    /* Wait for there to be enough data for us to read a whole packet */
+    if(c->in.queue_len < length)
+        return 0;
 
-    /* If this request has not been written yet, write it. */
-    if((signed int) (c->out.request_written - request) < 0)
-        if(_xcb_out_flush(c) <= 0)
-            goto done; /* error */
+    /* Get the response type, length, and sequence number. */
+    memcpy(&genrep, c->in.queue, sizeof(genrep));
 
-    if(_xcb_list_find(c->in.readers, match_reply, &request))
-        goto done; /* error */
+    /* Compute 32-bit sequence number of this packet. */
+    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(e)
+        if(c->in.request_read != lastread)
+        {
+            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 != 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(genrep.response_type == XCBError || genrep.response_type == XCBReply)
+    {
+        pend = c->in.pending_replies;
+        if(pend && pend->request != c->in.request_read)
+            pend = 0;
+    }
+
+    /* For reply packets, check that the entire packet is available. */
+    if(genrep.response_type == XCBReply)
+    {
+        if(pend && pend->workaround == WORKAROUND_GLX_GET_FB_CONFIGS_BUG)
+        {
+            CARD32 *p = (CARD32 *) c->in.queue;
+            genrep.length = p[2] * p[3] * 2;
+        }
+        length += genrep.length * 4;
+    }
+
+    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))
     {
-        *e = _xcb_list_remove(c->in.events, match_request_error, &request);
-        if(*e)
-            goto done;
+        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 == XCBReply ||
+       (genrep.response_type == XCBError && pend && (pend->flags & XCB_REQUEST_CHECKED)))
+    {
+        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;
+    }
+
+    /* event, or unchecked error */
+    event = malloc(sizeof(struct event_list));
+    if(!event)
+    {
+        free(buf);
+        return 0;
     }
+    event->event = buf;
+    event->next = 0;
+    *c->in.events_tail = event;
+    c->in.events_tail = &event->next;
+    pthread_cond_signal(&c->in.event_cond);
+    return 1; /* I have something for you... */
+}
 
-    reader.request = request;
-    reader.data = &cond;
-    reader.error = e;
-    _xcb_list_append(c->in.readers, &reader);
+static XCBGenericEvent *get_event(XCBConnection *c)
+{
+    struct event_list *cur = c->in.events;
+    XCBGenericEvent *ret;
+    if(!c->in.events)
+        return 0;
+    ret = cur->event;
+    c->in.events = cur->next;
+    if(!cur->next)
+        c->in.events_tail = &c->in.events;
+    free(cur);
+    return ret;
+}
 
-    /* If this request has not been read yet, wait for it. */
-    while(!(e && *e) && ((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) <= 0)
-            goto done;
+static void free_reply_list(struct reply_list *head)
+{
+    while(head)
+    {
+        struct reply_list *cur = head;
+        head = cur->next;
+        free(cur->reply);
+        free(cur);
+    }
+}
 
-    if(c->in.request_read != request)
+static int read_block(const int fd, void *buf, const size_t len)
+{
+    int done = 0;
+    while(done < len)
     {
-        _xcb_queue *q = _xcb_map_get(c->in.replies, request);
-        if(q)
+        int ret = read(fd, ((char *) buf) + done, len - done);
+        if(ret > 0)
+            done += ret;
+        if(ret < 0 && errno == EAGAIN)
         {
-            ret = _xcb_queue_dequeue(q);
-            if(_xcb_queue_is_empty(q))
-                _xcb_queue_delete(_xcb_map_remove(c->in.replies, request), free);
+            fd_set fds;
+            FD_ZERO(&fds);
+            FD_SET(fd, &fds);
+	    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
-        ret = _xcb_queue_dequeue(c->in.current_reply);
+        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)
+{
+    void *ret = 0;
+    if(e)
+        *e = 0;
+
+    pthread_mutex_lock(&c->iolock);
 
-done:
-    _xcb_list_remove(c->in.readers, match_reply, &request);
-    pthread_cond_destroy(&cond);
+    /* 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);
@@ -132,24 +355,14 @@ XCBGenericEvent *XCBWaitEvent(XCBConnection *c)
 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)))
-        if(_xcb_conn_wait(c, /*should_write*/ 0, &c->in.event_cond) <= 0)
+    /* get_event returns 0 on empty list. */
+    while(!(ret = get_event(c)))
+        if(!_xcb_conn_wait(c, &c->in.event_cond, 0, 0))
             break;
 
     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;
 }
 
@@ -160,8 +373,8 @@ XCBGenericEvent *XCBPollForEvent(XCBConnection *c, int *error)
     if(error)
         *error = 0;
     /* FIXME: follow X meets Z architecture changes. */
-    if(_xcb_in_read(c) >= 0)
-        ret = _xcb_queue_dequeue(c->in.events);
+    if(_xcb_in_read(c))
+        ret = get_event(c);
     else if(error)
         *error = -1;
     else
@@ -195,107 +408,62 @@ int _xcb_in_init(_xcb_in *in)
     in->queue_len = 0;
 
     in->request_read = 0;
-    in->current_reply = _xcb_queue_new();
+    in->request_completed = 0;
 
     in->replies = _xcb_map_new();
-    in->events = _xcb_queue_new();
-    in->readers = _xcb_list_new();
-    if(!in->current_reply || !in->replies || !in->events || !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;
+
     return 1;
 }
 
 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_queue_delete(in->events, free);
-    _xcb_list_delete(in->readers, 0);
-}
-
-int _xcb_in_expect_reply(XCBConnection *c, unsigned int request)
-{
-    /* XXX: currently a no-op */
-    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));
-
-    /* For reply packets, check that the entire packet is available. */
-    if(genrep.response_type == 1)
-        length += genrep.length * 4;
-
-    buf = malloc(length);
-    if(!buf)
-        return 0;
-    if(_xcb_in_read_block(c, buf, length) <= 0)
+    free_reply_list(in->current_reply);
+    _xcb_map_delete(in->replies, (void (*)(void *)) free_reply_list);
+    while(in->events)
     {
-        free(buf);
-        return 0;
+        struct event_list *e = in->events;
+        in->events = e->next;
+        free(e->event);
+        free(e);
     }
-
-    /* Compute 32-bit sequence number of this packet. */
-    /* XXX: do "sequence lost" check here */
-    if((genrep.response_type & 0x7f) != KeymapNotify)
+    while(in->pending_replies)
     {
-        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;
-    }
-
-    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;
-        }
+        pending_reply *pend = in->pending_replies;
+        in->pending_replies = pend->next;
+        free(pend);
     }
+}
 
-    /* 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_expect_reply(XCBConnection *c, unsigned int request, enum workarounds workaround, int flags)
+{
+    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;
 }
 
 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)
@@ -310,7 +478,7 @@ 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;
     }