#include <assert.h>
#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 */
return c->out.maximum_request_length;
}
-int XCBSendRequest(XCBConnection *c, unsigned int *request, struct iovec *vector, const XCBProtocolRequest *req)
+unsigned int XCBSendRequest(XCBConnection *c, int flags, struct iovec *vector, const XCBProtocolRequest *req)
{
- int ret;
- int i;
- struct iovec prefix[2];
- CARD16 shortlen = 0;
- CARD32 longlen = 0;
+ 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);
- /* put together the length field, possibly using BIGREQUESTS */
- for(i = 0; i < req->count; ++i)
- longlen += XCB_CEIL(vector[i].iov_len) >> 2;
-
- if(longlen > c->setup->maximum_request_length)
- {
- if(longlen > XCBGetMaximumRequestLength(c))
- return 0; /* server can't take this; maybe need BIGREQUESTS? */
- }
- else
+ if(!(flags & XCB_REQUEST_RAW))
{
- /* we don't need BIGREQUESTS. */
- shortlen = longlen;
- longlen = 0;
- }
+ static const char pad[3];
+ int i;
+ CARD16 shortlen = 0;
+ size_t longlen = 0;
+ assert(vector[0].iov_len >= 4);
+ /* set the major opcode, and the minor opcode for extensions */
+ if(req->ext)
+ {
+ const XCBQueryExtensionRep *extension = XCBGetExtensionData(c, req->ext);
+ if(!(extension && extension->present))
+ return 0;
+ ((CARD8 *) vector[0].iov_base)[0] = extension->major_opcode;
+ ((CARD8 *) vector[0].iov_base)[1] = req->opcode;
+ }
+ else
+ ((CARD8 *) vector[0].iov_base)[0] = req->opcode;
- /* set the length field. */
- i = 0;
- prefix[i].iov_base = vector[0].iov_base;
- prefix[i].iov_len = sizeof(CARD32);
- vector[0].iov_base = ((char *) vector[0].iov_base) + sizeof(CARD32);
- vector[0].iov_len -= sizeof(CARD32);
- ((CARD16 *) prefix[i].iov_base)[1] = shortlen;
- ++i;
- if(!shortlen)
- {
- ++longlen;
- prefix[i].iov_base = &longlen;
- prefix[i].iov_len = sizeof(CARD32);
- ++i;
- }
+ /* put together the length field, possibly using BIGREQUESTS */
+ for(i = 0; i < req->count; ++i)
+ {
+ longlen += vector[i].iov_len;
+ if(!vector[i].iov_base)
+ {
+ vector[i].iov_base = (char *) pad;
+ assert(vector[i].iov_len <= sizeof(pad));
+ }
+ }
+ assert((longlen & 3) == 0);
+ longlen >>= 2;
- /* set the major opcode, and the minor opcode for extensions */
- if(req->ext)
- {
- const XCBQueryExtensionRep *extension = XCBGetExtensionData(c, req->ext);
- /* TODO: better error handling here, please! */
- assert(extension && extension->present);
- ((CARD8 *) prefix[0].iov_base)[0] = extension->major_opcode;
- ((CARD8 *) prefix[0].iov_base)[1] = req->opcode;
+ 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? */
- /* do we need to work around the X server bug described in glx.xml? */
- if(strcmp(req->ext->name, "GLX") &&
- ((req->opcode == 17 && ((CARD32 *) vector[0].iov_base)[0] == 0x10004) ||
- req->opcode == 21))
- workaround = WORKAROUND_GLX_GET_FB_CONFIGS_BUG;
+ /* set the length field. */
+ ((CARD16 *) vector[0].iov_base)[1] = shortlen;
+ if(!shortlen)
+ prefix[2] = ++longlen;
}
- else
- ((CARD8 *) prefix[0].iov_base)[0] = req->opcode;
+ flags &= ~XCB_REQUEST_RAW;
+
+ /* do we need to work around the X server bug described in glx.xml? */
+ if(req->ext && !req->isvoid && strcmp(req->ext->name, "GLX") &&
+ ((req->opcode == 17 && ((CARD32 *) vector[0].iov_base)[0] == 0x10004) ||
+ req->opcode == 21))
+ workaround = WORKAROUND_GLX_GET_FB_CONFIGS_BUG;
/* get a sequence number and arrange for delivery. */
pthread_mutex_lock(&c->iolock);
- if(req->isvoid && !force_sequence_wrap(c))
+ /* wait for other writing threads to get out of my way. */
+ while(c->out.writing)
+ pthread_cond_wait(&c->out.cond, &c->iolock);
+
+ if(req->isvoid && c->out.request == c->in.request_expected + (1 << 16) - 2)
{
- pthread_mutex_unlock(&c->iolock);
- return -1;
+ 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;
}
- *request = ++c->out.request;
-
+ request = ++c->out.request;
+ assert(request != 0);
+ if(workaround != WORKAROUND_NONE || flags != 0)
+ _xcb_in_expect_reply(c, request, workaround, flags);
if(!req->isvoid)
- _xcb_in_expect_reply(c, *request, workaround);
+ c->in.request_expected = c->out.request;
- ret = _xcb_out_write_block(c, prefix, i);
- if(ret > 0)
- ret = _xcb_out_write_block(c, vector, req->count);
- pthread_mutex_unlock(&c->iolock);
+ 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];
+ }
- return ret;
+ if(!write_block(c, vector, veclen))
+ request = 0;
+ pthread_mutex_unlock(&c->iolock);
+ 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;
}
out->writing = 0;
out->queue_len = 0;
- out->vec = 0;
- out->vec_len = 0;
out->request = 0;
out->request_written = 0;
{
pthread_cond_destroy(&out->cond);
pthread_mutex_destroy(&out->reqlenlock);
- free(out->vec);
}
-int _xcb_out_write(XCBConnection *c)
+int _xcb_out_send(XCBConnection *c, struct iovec **vector, int *count)
{
- int n;
- if(c->out.vec_len)
- n = _xcb_writev(c->fd, c->out.vec, c->out.vec_len);
- else
- n = _xcb_write(c->fd, &c->out.queue, &c->out.queue_len);
-
- if(n < 0 && errno == EAGAIN)
- n = 1;
-
- if(c->out.vec_len)
- {
- int i;
- for(i = 0; i < c->out.vec_len; ++i)
- if(c->out.vec[i].iov_len)
- return n;
- c->out.vec_len = 0;
- }
- return n;
+ 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)
{
- static const char pad[3];
- int i;
- int len = 0;
-
- for(i = 0; i < count; ++i)
- len += XCB_CEIL(vector[i].iov_len);
-
- /* Is the queue about to overflow? */
- if(c->out.queue_len + len < sizeof(c->out.queue))
- {
- /* No, this will fit. */
- for(i = 0; i < count; ++i)
- {
- memcpy(c->out.queue + c->out.queue_len, vector[i].iov_base, vector[i].iov_len);
- if(vector[i].iov_len & 3)
- memset(c->out.queue + c->out.queue_len + vector[i].iov_len, 0, XCB_PAD(vector[i].iov_len));
- c->out.queue_len += XCB_CEIL(vector[i].iov_len);
- }
- return len;
- }
-
- assert(!c->out.vec_len);
- assert(!c->out.vec);
- c->out.vec = malloc(sizeof(struct iovec) * (1 + count * 2));
- if(!c->out.vec)
- return -1;
+ assert(request <= c->out.request);
+ if(c->out.request_written >= request)
+ return 1;
if(c->out.queue_len)
{
- c->out.vec[c->out.vec_len].iov_base = c->out.queue;
- c->out.vec[c->out.vec_len++].iov_len = c->out.queue_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.queue_len = 0;
+ return _xcb_out_send(c, &vec_ptr, &count);
}
- for(i = 0; i < count; ++i)
- {
- if(!vector[i].iov_len)
- continue;
- c->out.vec[c->out.vec_len].iov_base = vector[i].iov_base;
- c->out.vec[c->out.vec_len++].iov_len = vector[i].iov_len;
- if(!XCB_PAD(vector[i].iov_len))
- continue;
- c->out.vec[c->out.vec_len].iov_base = (void *) pad;
- c->out.vec[c->out.vec_len++].iov_len = XCB_PAD(vector[i].iov_len);
- }
- if(_xcb_out_flush(c) <= 0)
- len = -1;
- free(c->out.vec);
- c->out.vec = 0;
-
- return len;
-}
-
-int _xcb_out_flush(XCBConnection *c)
-{
- int ret = 1;
- while(ret > 0 && (c->out.queue_len || 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;
}
projects / free-sw / xcb / libxcb / blobdiff