#include <string.h>
#include <errno.h>
-#ifndef __GNUC__
-# if HAVE_ALLOCA_H
-# include <alloca.h>
-# else
-# ifdef _AIX
- #pragma alloca
-# endif
-# endif
-#endif
-
#include "xcb.h"
#include "xcbext.h"
#include "xcbint.h"
#include "extensions/bigreq.h"
-static int force_sequence_wrap(XCBConnection *c)
-{
- int ret = 1;
- if((c->out.request - c->in.request_read) > 65530)
- {
- pthread_mutex_unlock(&c->iolock);
- ret = XCBSync(c, 0);
- pthread_mutex_lock(&c->iolock);
- }
- return ret;
-}
-
/* Public interface */
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)
{
- static const char pad[3];
- int ret;
- int i;
- CARD32 prefix[2];
- struct iovec *padded;
- int padlen = 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);
- padded =
-#ifdef HAVE_ALLOCA
- alloca
-#else
- malloc
-#endif
- ((req->count * 2 + 2) * sizeof(struct iovec));
-
if(!(flags & XCB_REQUEST_RAW))
{
+ static const char pad[3];
+ int i;
CARD16 shortlen = 0;
- CARD32 longlen = 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);
- /* 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;
}
/* put together the length field, possibly using BIGREQUESTS */
for(i = 0; i < req->count; ++i)
- longlen += (vector[i].iov_len + 3) >> 2;
+ {
+ longlen += vector[i].iov_len;
+ if(!vector[i].iov_base)
+ {
+ vector[i].iov_base = (caddr_t) pad;
+ assert(vector[i].iov_len <= sizeof(pad));
+ }
+ }
+ assert((longlen & 3) == 0);
+ longlen >>= 2;
if(longlen <= c->setup->maximum_request_length)
{
/* set the length field. */
((CARD16 *) vector[0].iov_base)[1] = shortlen;
if(!shortlen)
- {
- padded[0].iov_base = prefix;
- padded[0].iov_len = sizeof(prefix);
- prefix[0] = ((CARD32 *) vector[0].iov_base)[0];
- prefix[1] = ++longlen;
- vector[0].iov_base = ((char *) vector[0].iov_base) + sizeof(CARD32);
- vector[0].iov_len -= sizeof(CARD32);
- padlen = 1;
- }
+ prefix[2] = ++longlen;
}
flags &= ~XCB_REQUEST_RAW;
- for(i = 0; i < req->count; ++i)
- {
- if(!vector[i].iov_len)
- continue;
- padded[padlen].iov_base = vector[i].iov_base;
- padded[padlen++].iov_len = vector[i].iov_len;
- if(!XCB_PAD(vector[i].iov_len))
- continue;
- padded[padlen].iov_base = (caddr_t) pad;
- padded[padlen++].iov_len = XCB_PAD(vector[i].iov_len);
- }
-
/* 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) ||
/* 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);
-#ifndef HAVE_ALLOCA
- free(padded);
-#endif
- 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);
+ _xcb_in_expect_reply(c, request, workaround, flags);
+ if(!req->isvoid)
+ c->in.request_expected = c->out.request;
- ret = _xcb_out_write_block(c, padded, padlen);
- pthread_mutex_unlock(&c->iolock);
-#ifndef HAVE_ALLOCA
- free(padded);
-#endif
+ 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(!_xcb_out_write_block(c, vector, veclen))
+ request = 0;
+ pthread_mutex_unlock(&c->iolock);
+ return request;
}
int XCBFlush(XCBConnection *c)
{
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;
}
if(!count)
return 1;
- memmove(vector + 1, vector, count++ * sizeof(struct iovec));
+ --vector, ++count;
vector[0].iov_base = c->out.queue;
vector[0].iov_len = c->out.queue_len;
c->out.queue_len = 0;
projects / free-sw / xcb / libxcb / blobdiff