#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 write_block(xcb_connection_t *c, struct iovec *vector, int count)
+{
+ 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[0].iov_base = (char *) vector[0].iov_base + vector[0].iov_len;
+ vector[0].iov_len = 0;
+ ++vector, --count;
+ }
+ 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 */
-CARD32 XCBGetMaximumRequestLength(XCBConnection *c)
+uint32_t xcb_get_maximum_request_length(xcb_connection_t *c)
{
+ if(c->has_error)
+ return 0;
pthread_mutex_lock(&c->out.reqlenlock);
if(!c->out.maximum_request_length)
{
- const XCBQueryExtensionRep *ext;
+ const xcb_query_extension_reply_t *ext;
c->out.maximum_request_length = c->setup->maximum_request_length;
- ext = XCBGetExtensionData(c, &XCBBigRequestsId);
+ ext = xcb_get_extension_data(c, &xcb_big_requests_id);
if(ext && ext->present)
{
- XCBBigRequestsEnableRep *r = XCBBigRequestsEnableReply(c, XCBBigRequestsEnable(c), 0);
+ xcb_big_requests_enable_reply_t *r = xcb_big_requests_enable_reply(c, xcb_big_requests_enable(c), 0);
c->out.maximum_request_length = r->maximum_request_length;
free(r);
}
return c->out.maximum_request_length;
}
-unsigned int XCBSendRequest(XCBConnection *c, int flags, struct iovec *vector, const XCBProtocolRequest *req)
+unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vector, const xcb_protocol_request_t *req)
{
static const union {
struct {
- CARD8 major;
- CARD8 pad;
- CARD16 len;
+ uint8_t major;
+ uint8_t pad;
+ uint16_t len;
} fields;
- CARD32 packet;
+ uint32_t packet;
} sync = { { /* GetInputFocus */ 43, 0, 1 } };
unsigned int request;
- CARD32 prefix[3] = { 0 };
+ uint32_t prefix[3] = { 0 };
int veclen = req->count;
enum workarounds workaround = WORKAROUND_NONE;
+ if(c->has_error)
+ return 0;
+
assert(c != 0);
assert(vector != 0);
assert(req->count > 0);
{
static const char pad[3];
int i;
- CARD16 shortlen = 0;
+ uint16_t 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);
+ const xcb_query_extension_reply_t *extension = xcb_get_extension_data(c, req->ext);
if(!(extension && extension->present))
+ {
+ _xcb_conn_shutdown(c);
return 0;
- ((CARD8 *) vector[0].iov_base)[0] = extension->major_opcode;
- ((CARD8 *) vector[0].iov_base)[1] = req->opcode;
+ }
+ ((uint8_t *) vector[0].iov_base)[0] = extension->major_opcode;
+ ((uint8_t *) vector[0].iov_base)[1] = req->opcode;
}
else
- ((CARD8 *) vector[0].iov_base)[0] = req->opcode;
+ ((uint8_t *) vector[0].iov_base)[0] = req->opcode;
/* 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 = (caddr_t) pad;
+ vector[i].iov_base = (char *) pad;
assert(vector[i].iov_len <= sizeof(pad));
}
}
shortlen = longlen;
longlen = 0;
}
- else if(longlen > XCBGetMaximumRequestLength(c))
+ else if(longlen > xcb_get_maximum_request_length(c))
+ {
+ _xcb_conn_shutdown(c);
return 0; /* server can't take this; maybe need BIGREQUESTS? */
+ }
/* set the length field. */
- ((CARD16 *) vector[0].iov_base)[1] = shortlen;
+ ((uint16_t *) vector[0].iov_base)[1] = shortlen;
if(!shortlen)
prefix[2] = ++longlen;
}
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) ||
+ /* XXX: GetFBConfigs won't use BIG-REQUESTS in any sane
+ * configuration, but that should be handled here anyway. */
+ if(req->ext && !req->isvoid && !strcmp(req->ext->name, "GLX") &&
+ ((req->opcode == 17 && ((uint32_t *) vector[0].iov_base)[1] == 0x10004) ||
req->opcode == 21))
workaround = WORKAROUND_GLX_GET_FB_CONFIGS_BUG;
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)
+ request = ++c->out.request;
+ /* send GetInputFocus (sync) when 64k-2 requests have been sent without
+ * a reply.
+ * Also send sync (could use NoOp) at 32-bit wrap to avoid having
+ * applications see sequence 0 as that is used to indicate
+ * an error in sending the request */
+ while((req->isvoid &&
+ c->out.request == c->in.request_expected + (1 << 16) - 1) ||
+ request == 0)
{
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);
- _xcb_in_expect_reply(c, request, workaround, flags);
+ if(workaround != WORKAROUND_NONE || flags != 0)
+ _xcb_in_expect_reply(c, request, workaround, flags);
if(!req->isvoid)
c->in.request_expected = c->out.request;
--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);
+ prefix[1] = ((uint32_t *) vector[1].iov_base)[0];
+ vector[1].iov_base = (uint32_t *) vector[1].iov_base + 1;
+ vector[1].iov_len -= sizeof(uint32_t);
}
- vector[0].iov_len = sizeof(CARD32) * (prefix[0] ? 1 : 0 | prefix[2] ? 2 : 0);
+ vector[0].iov_len = sizeof(uint32_t) * (prefix[0] ? 1 : 0 | prefix[2] ? 2 : 0);
vector[0].iov_base = prefix + !prefix[0];
}
- if(!_xcb_out_write_block(c, vector, veclen))
+ if(!write_block(c, vector, veclen))
+ {
+ _xcb_conn_shutdown(c);
request = 0;
+ }
pthread_mutex_unlock(&c->iolock);
return request;
}
-int XCBFlush(XCBConnection *c)
+int xcb_flush(xcb_connection_t *c)
{
int ret;
+ if(c->has_error)
+ return 0;
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_mutex_destroy(&out->reqlenlock);
}
-/* precondition: there must be something for us to write. */
-int _xcb_out_write(XCBConnection *c)
+int _xcb_out_send(xcb_connection_t *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(xcb_connection_t *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[0].iov_base = (char *) vector[0].iov_base + vector[0].iov_len;
- vector[0].iov_len = 0;
- ++vector, --count;
- }
- if(!count)
+ assert(XCB_SEQUENCE_COMPARE(request, <=, c->out.request));
+ if(XCB_SEQUENCE_COMPARE(c->out.request_written, >=, request))
return 1;
-
- --vector, ++count;
- 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(XCB_SEQUENCE_COMPARE(c->out.request_written, >=, request));
+ return 1;
}