Replace pending_replies generic queue with a hand-implemented typesafe version.

[free-sw/xcb/libxcb] / src / xcb_in.c

diff --git a/src/xcb_in.c b/src/xcb_in.c
index 4a62a48..e050dfc 100644 (file)
--- a/src/xcb_in.c
+++ b/src/xcb_in.c
@@ -36,9 +36,10 @@
 #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 {
@@ -69,14 +70,6 @@ static void wake_up_next_reader(XCBConnection *c)
     assert(pthreadret == 0);
 }
 
-static int readn(const int fd, void *buf, const int buflen, int *count)
-{
-    int n = read(fd, ((char *) buf) + *count, buflen - *count);
-    if(n > 0)
-        *count += n;
-    return n;
-}
-
 static int read_packet(XCBConnection *c)
 {
     XCBGenericRep genrep;
@@ -107,7 +100,7 @@ static int read_packet(XCBConnection *c)
     /* 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);
+        pending_reply *pend = c->in.pending_replies;
         if(pend && pend->request == c->in.request_read)
         {
             switch(pend->workaround)
@@ -121,7 +114,10 @@ static int read_packet(XCBConnection *c)
                 }
                 break;
             }
-            free(_xcb_queue_dequeue(c->in.pending_replies));
+            c->in.pending_replies = pend->next;
+            if(!pend->next)
+                c->in.pending_replies_tail = &c->in.pending_replies;
+            free(pend);
         }
         length += genrep.length * 4;
     }
@@ -161,6 +157,27 @@ static int read_packet(XCBConnection *c)
     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)
@@ -230,11 +247,6 @@ 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)))
@@ -243,11 +255,6 @@ XCBGenericEvent *XCBWaitForEvent(XCBConnection *c)
 
     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;
 }
 
@@ -298,11 +305,11 @@ int _xcb_in_init(_xcb_in *in)
     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;
 }
 
@@ -313,7 +320,12 @@ void _xcb_in_destroy(_xcb_in *in)
     _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)
@@ -325,18 +337,18 @@ int _xcb_in_expect_reply(XCBConnection *c, unsigned int request, enum 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(XCBConnection *c)
 {
-    int n = readn(c->fd, c->in.queue, sizeof(c->in.queue), &c->in.queue_len);
+    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 > 0) || (n < 0 && errno == EAGAIN);
@@ -354,7 +366,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;
     }