Replace my old generic map ADT with a growable array for the extension cache.

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

diff --git a/src/xcb_out.c b/src/xcb_out.c
index e7d5323..fd0a27f 100644 (file)
--- a/src/xcb_out.c
+++ b/src/xcb_out.c
@@ -58,28 +58,6 @@ static int force_sequence_wrap(XCBConnection *c)
     return ret;
 }
 
-static int _xcb_writev(const int fd, struct iovec *vec, int count)
-{
-    int n = writev(fd, vec, count);
-    if(n > 0)
-    {
-        int rem = n;
-        for(; count; --count, ++vec)
-        {
-            int cur = vec->iov_len;
-            if(cur > rem)
-                cur = rem;
-            vec->iov_len -= cur;
-            vec->iov_base = (char *) vec->iov_base + cur;
-            rem -= cur;
-            if(vec->iov_len)
-                break;
-        }
-        assert(rem == 0);
-    }
-    return n;
-}
-
 /* Public interface */
 
 CARD32 XCBGetMaximumRequestLength(XCBConnection *c)
@@ -137,19 +115,16 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, struct iovec *vector
 
     /* put together the length field, possibly using BIGREQUESTS */
     for(i = 0; i < req->count; ++i)
-        longlen += XCB_CEIL(vector[i].iov_len) >> 2;
+        longlen += (vector[i].iov_len + 3) >> 2;
 
-    if(longlen > c->setup->maximum_request_length)
-    {
-        if(longlen > XCBGetMaximumRequestLength(c))
-            return 0; /* server can't take this; maybe need BIGREQUESTS? */
-    }
-    else
+    if(longlen <= c->setup->maximum_request_length)
     {
         /* we don't need BIGREQUESTS. */
         shortlen = longlen;
         longlen = 0;
     }
+    else if(longlen > XCBGetMaximumRequestLength(c))
+        return 0; /* server can't take this; maybe need BIGREQUESTS? */
 
     padded =
 #ifdef HAVE_ALLOCA
@@ -251,16 +226,34 @@ int _xcb_out_write(XCBConnection *c)
 {
     int n;
     assert(!c->out.queue_len);
-    n = _xcb_writev(c->fd, c->out.vec, c->out.vec_len);
-    while(c->out.vec_len && !c->out.vec[0].iov_len)
-        ++c->out.vec, --c->out.vec_len;
+    n = writev(c->fd, c->out.vec, c->out.vec_len);
+    if(n < 0 && errno == EAGAIN)
+        return 1;
+    if(n <= 0)
+        return 0;
+
+    for(; c->out.vec_len; --c->out.vec_len, ++c->out.vec)
+    {
+        int cur = c->out.vec->iov_len;
+        if(cur > n)
+            cur = n;
+        c->out.vec->iov_len -= cur;
+        c->out.vec->iov_base = (char *) c->out.vec->iov_base + cur;
+        n -= cur;
+        if(c->out.vec->iov_len)
+            break;
+    }
     if(!c->out.vec_len)
         c->out.vec = 0;
-    return (n > 0) || (n < 0 && errno == EAGAIN);
+    assert(n == 0);
+    return 1;
 }
 
 int _xcb_out_write_block(XCBConnection *c, struct iovec *vector, size_t count)
 {
+    while(c->out.writing)
+        pthread_cond_wait(&c->out.cond, &c->iolock);
+    assert(!c->out.vec && !c->out.vec_len);
     while(count && c->out.queue_len + vector[0].iov_len < sizeof(c->out.queue))
     {
         memcpy(c->out.queue + c->out.queue_len, vector[0].iov_base, vector[0].iov_len);
@@ -275,8 +268,6 @@ int _xcb_out_write_block(XCBConnection *c, struct iovec *vector, size_t count)
     vector[0].iov_len = c->out.queue_len;
     c->out.queue_len = 0;
 
-    assert(!c->out.vec_len);
-    assert(!c->out.vec);
     c->out.vec_len = count;
     c->out.vec = vector;
     return _xcb_out_flush(c);
@@ -288,8 +279,7 @@ int _xcb_out_flush(XCBConnection *c)
     struct iovec vec;
     if(c->out.queue_len)
     {
-        assert(!c->out.vec_len);
-        assert(!c->out.vec);
+        assert(!c->out.vec && !c->out.vec_len);
         vec.iov_base = c->out.queue;
         vec.iov_len = c->out.queue_len;
         c->out.vec = &vec;