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)
return c->out.maximum_request_length;
}
-int XCBSendRequest(XCBConnection *c, unsigned int *request, struct iovec *vector, const XCBProtocolRequest *req)
+int XCBSendRequest(XCBConnection *c, unsigned int *request, int flags, struct iovec *vector, const XCBProtocolRequest *req)
{
static const char pad[3];
int ret;
((CARD8 *) vector[0].iov_base)[1] = req->opcode;
/* do we need to work around the X server bug described in glx.xml? */
- if(strcmp(req->ext->name, "GLX") &&
+ if(!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;
for(i = 0; i < req->count; ++i)
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
*request = ++c->out.request;
- if(!req->isvoid)
- _xcb_in_expect_reply(c, *request, workaround);
+ _xcb_in_expect_reply(c, *request, workaround, flags);
ret = _xcb_out_write_block(c, padded, padlen);
pthread_mutex_unlock(&c->iolock);
{
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)