X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_out.c;h=26679732698c52c3c389c15faec75c592ffbd0b7;hb=2a18842f0f93516ff726a2dfa44348410bb55626;hp=78ec8ca9cd70e59a5ff60d683a2c0ae72b2afc31;hpb=87905f0579e749ac6d92843780af246160318eca;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_out.c b/src/xcb_out.c
index 78ec8ca..2667973 100644
--- a/src/xcb_out.c
+++ b/src/xcb_out.c
@@ -29,23 +29,30 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <errno.h>
 
 #include "xcb.h"
 #include "xcbext.h"
 #include "xcbint.h"
 #include "extensions/bigreq.h"
 
-static int force_sequence_wrap(XCBConnection *c)
+static int write_block(XCBConnection *c, struct iovec *vector, int count)
 {
-    int ret = 1;
-    if((c->out.request - c->in.request_read) > 65530)
+    while(count && c->out.queue_len + vector[0].iov_len <= sizeof(c->out.queue))
     {
-        pthread_mutex_unlock(&c->iolock);
-        ret = XCBSync(c, 0);
-        pthread_mutex_lock(&c->iolock);
+        memcpy(c->out.queue + c->out.queue_len, vector[0].iov_base, vector[0].iov_len);
+        c->out.queue_len += vector[0].iov_len;
+        vector[0].iov_base = (char *) vector[0].iov_base + vector[0].iov_len;
+        vector[0].iov_len = 0;
+        ++vector, --count;
     }
-    return ret;
+    if(!count)
+        return 1;
+
+    --vector, ++count;
+    vector[0].iov_base = c->out.queue;
+    vector[0].iov_len = c->out.queue_len;
+    c->out.queue_len = 0;
+    return _xcb_out_send(c, &vector, &count);
 }
 
 /* Public interface */
@@ -69,15 +76,22 @@ CARD32 XCBGetMaximumRequestLength(XCBConnection *c)
     return c->out.maximum_request_length;
 }
 
-int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct iovec *vector, const XCBProtocolRequest *req)
+unsigned int XCBSendRequest(XCBConnection *c, int flags, struct iovec *vector, const XCBProtocolRequest *req)
 {
-    int ret;
-    CARD32 prefix[2];
+    static const union {
+        struct {
+            CARD8 major;
+            CARD8 pad;
+            CARD16 len;
+        } fields;
+        CARD32 packet;
+    } sync = { { /* GetInputFocus */ 43, 0, 1 } };
+    unsigned int request;
+    CARD32 prefix[3] = { 0 };
     int veclen = req->count;
     enum workarounds workaround = WORKAROUND_NONE;
 
     assert(c != 0);
-    assert(request != 0);
     assert(vector != 0);
     assert(req->count > 0);
 
@@ -92,8 +106,8 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct io
         if(req->ext)
         {
             const XCBQueryExtensionRep *extension = XCBGetExtensionData(c, req->ext);
-            /* TODO: better error handling here, please! */
-            assert(extension && extension->present);
+            if(!(extension && extension->present))
+                return 0;
             ((CARD8 *) vector[0].iov_base)[0] = extension->major_opcode;
             ((CARD8 *) vector[0].iov_base)[1] = req->opcode;
         }
@@ -106,7 +120,7 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct io
             longlen += vector[i].iov_len;
             if(!vector[i].iov_base)
             {
-                vector[i].iov_base = (caddr_t) pad;
+                vector[i].iov_base = (char *) pad;
                 assert(vector[i].iov_len <= sizeof(pad));
             }
         }
@@ -125,16 +139,7 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct io
         /* set the length field. */
         ((CARD16 *) vector[0].iov_base)[1] = shortlen;
         if(!shortlen)
-        {
-            memmove(vector + 1, vector, veclen++ * sizeof(*vector));
-            ++veclen;
-            vector[0].iov_base = prefix;
-            vector[0].iov_len = sizeof(prefix);
-            prefix[0] = ((CARD32 *) vector[0].iov_base)[0];
-            prefix[1] = ++longlen;
-            vector[1].iov_base = ((char *) vector[1].iov_base) + sizeof(CARD32);
-            vector[1].iov_len -= sizeof(CARD32);
-        }
+            prefix[2] = ++longlen;
     }
     flags &= ~XCB_REQUEST_RAW;
 
@@ -146,30 +151,49 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct io
 
     /* get a sequence number and arrange for delivery. */
     pthread_mutex_lock(&c->iolock);
-    if(req->isvoid && !force_sequence_wrap(c))
-    {
-        pthread_mutex_unlock(&c->iolock);
-        return -1;
-    }
-
     /* wait for other writing threads to get out of my way. */
     while(c->out.writing)
         pthread_cond_wait(&c->out.cond, &c->iolock);
 
-    *request = ++c->out.request;
+    if(req->isvoid && c->out.request == c->in.request_expected + (1 << 16) - 2)
+    {
+        prefix[0] = sync.packet;
+        request = ++c->out.request;
+        _xcb_in_expect_reply(c, request, WORKAROUND_NONE, XCB_REQUEST_DISCARD_REPLY);
+        c->in.request_expected = c->out.request;
+    }
 
-    _xcb_in_expect_reply(c, *request, workaround, flags);
+    request = ++c->out.request;
+    assert(request != 0);
+    if(workaround != WORKAROUND_NONE || flags != 0)
+        _xcb_in_expect_reply(c, request, workaround, flags);
+    if(!req->isvoid)
+        c->in.request_expected = c->out.request;
 
-    ret = _xcb_out_write_block(c, vector, veclen);
+    if(prefix[0] || prefix[2])
+    {
+        --vector, ++veclen;
+        if(prefix[2])
+        {
+            prefix[1] = ((CARD32 *) vector[1].iov_base)[0];
+            vector[1].iov_base = (CARD32 *) vector[1].iov_base + 1;
+            vector[1].iov_len -= sizeof(CARD32);
+        }
+        vector[0].iov_len = sizeof(CARD32) * (prefix[0] ? 1 : 0 | prefix[2] ? 2 : 0);
+        vector[0].iov_base = prefix + !prefix[0];
+    }
+
+    if(!write_block(c, vector, veclen))
+        request = 0;
     pthread_mutex_unlock(&c->iolock);
-    return ret;
+    return request;
 }
 
 int XCBFlush(XCBConnection *c)
 {
     int ret;
     pthread_mutex_lock(&c->iolock);
-    ret = _xcb_out_flush(c);
+    ret = _xcb_out_flush_to(c, c->out.request);
     pthread_mutex_unlock(&c->iolock);
     return ret;
 }
@@ -183,8 +207,6 @@ int _xcb_out_init(_xcb_out *out)
     out->writing = 0;
 
     out->queue_len = 0;
-    out->vec = 0;
-    out->vec_len = 0;
 
     out->request = 0;
     out->request_written = 0;
@@ -202,72 +224,32 @@ void _xcb_out_destroy(_xcb_out *out)
     pthread_mutex_destroy(&out->reqlenlock);
 }
 
-/* precondition: there must be something for us to write. */
-int _xcb_out_write(XCBConnection *c)
+int _xcb_out_send(XCBConnection *c, struct iovec **vector, int *count)
 {
-    int n;
-    assert(!c->out.queue_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;
-    assert(n == 0);
-    return 1;
+    int ret = 1;
+    while(ret && *count)
+        ret = _xcb_conn_wait(c, &c->out.cond, vector, count);
+    c->out.request_written = c->out.request;
+    pthread_cond_broadcast(&c->out.cond);
+    return ret;
 }
 
-int _xcb_out_write_block(XCBConnection *c, struct iovec *vector, size_t count)
+int _xcb_out_flush_to(XCBConnection *c, unsigned int request)
 {
-    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);
-        c->out.queue_len += vector[0].iov_len;
-        ++vector, --count;
-    }
-    if(!count)
+    assert(request <= c->out.request);
+    if(c->out.request_written >= request)
         return 1;
-
-    memmove(vector + 1, vector, count++ * sizeof(struct iovec));
-    vector[0].iov_base = c->out.queue;
-    vector[0].iov_len = c->out.queue_len;
-    c->out.queue_len = 0;
-
-    c->out.vec_len = count;
-    c->out.vec = vector;
-    return _xcb_out_flush(c);
-}
-
-int _xcb_out_flush(XCBConnection *c)
-{
-    int ret = 1;
-    struct iovec vec;
     if(c->out.queue_len)
     {
-        assert(!c->out.vec && !c->out.vec_len);
+        struct iovec vec, *vec_ptr = &vec;
+        int count = 1;
         vec.iov_base = c->out.queue;
         vec.iov_len = c->out.queue_len;
-        c->out.vec = &vec;
-        c->out.vec_len = 1;
         c->out.queue_len = 0;
+        return _xcb_out_send(c, &vec_ptr, &count);
     }
-    while(ret && c->out.vec_len)
-        ret = _xcb_conn_wait(c, /*should_write*/ 1, &c->out.cond);
-    c->out.request_written = c->out.request;
-    pthread_cond_broadcast(&c->out.cond);
-    return ret;
+    while(c->out.writing)
+        pthread_cond_wait(&c->out.cond, &c->iolock);
+    assert(c->out.request_written >= request);
+    return 1;
 }