#include <stdlib.h>
#include <netinet/in.h>
#include <sys/select.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
+#include <errno.h>
#include "xcb.h"
#include "xcbint.h"
+typedef struct {
+ CARD8 status;
+ CARD8 pad0[5];
+ CARD16 length;
+} XCBSetupGeneric;
+
static int set_fd_flags(const int fd)
{
long flags = fcntl(fd, F_GETFL, 0);
static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
{
static const char pad[3];
- XCBConnSetupReq out;
+ XCBSetupReq out;
struct iovec parts[6];
int count = 0;
int endian = 0x01020304;
out.protocol_minor_version = X_PROTOCOL_REVISION;
out.authorization_protocol_name_len = 0;
out.authorization_protocol_data_len = 0;
- parts[count].iov_len = sizeof(XCBConnSetupReq);
+ parts[count].iov_len = sizeof(XCBSetupReq);
parts[count++].iov_base = &out;
- parts[count].iov_len = XCB_PAD(sizeof(XCBConnSetupReq));
- parts[count++].iov_base = (caddr_t) pad;
+ parts[count].iov_len = XCB_PAD(sizeof(XCBSetupReq));
+ parts[count++].iov_base = (char *) pad;
if(auth_info)
{
parts[count].iov_len = out.authorization_protocol_name_len = auth_info->namelen;
parts[count++].iov_base = auth_info->name;
parts[count].iov_len = XCB_PAD(out.authorization_protocol_name_len);
- parts[count++].iov_base = (caddr_t) pad;
+ parts[count++].iov_base = (char *) pad;
parts[count].iov_len = out.authorization_protocol_data_len = auth_info->datalen;
parts[count++].iov_base = auth_info->data;
parts[count].iov_len = XCB_PAD(out.authorization_protocol_data_len);
- parts[count++].iov_base = (caddr_t) pad;
+ parts[count++].iov_base = (char *) pad;
}
assert(count <= sizeof(parts) / sizeof(*parts));
pthread_mutex_lock(&c->iolock);
- _xcb_out_write_block(c, parts, count);
- ret = _xcb_out_flush(c);
+ {
+ struct iovec *parts_ptr = parts;
+ ret = _xcb_out_send(c, &parts_ptr, &count);
+ }
pthread_mutex_unlock(&c->iolock);
return ret;
}
static int read_setup(XCBConnection *c)
{
/* Read the server response */
- c->setup = malloc(sizeof(XCBConnSetupGenericRep));
+ c->setup = malloc(sizeof(XCBSetupGeneric));
if(!c->setup)
return 0;
- if(_xcb_in_read_block(c, c->setup, sizeof(XCBConnSetupGenericRep)) != sizeof(XCBConnSetupGenericRep))
+ if(_xcb_in_read_block(c, c->setup, sizeof(XCBSetupGeneric)) != sizeof(XCBSetupGeneric))
return 0;
{
- void *tmp = realloc(c->setup, c->setup->length * 4 + sizeof(XCBConnSetupGenericRep));
+ void *tmp = realloc(c->setup, c->setup->length * 4 + sizeof(XCBSetupGeneric));
if(!tmp)
return 0;
c->setup = tmp;
}
- if(_xcb_in_read_block(c, (char *) c->setup + sizeof(XCBConnSetupGenericRep), c->setup->length * 4) <= 0)
+ if(_xcb_in_read_block(c, (char *) c->setup + sizeof(XCBSetupGeneric), c->setup->length * 4) <= 0)
return 0;
/* 0 = failed, 2 = authenticate, 1 = success */
{
case 0: /* failed */
{
- XCBConnSetupFailedRep *setup = (XCBConnSetupFailedRep *) c->setup;
- write(STDERR_FILENO, XCBConnSetupFailedRepReason(setup), XCBConnSetupFailedRepReasonLength(setup));
+ XCBSetupFailed *setup = (XCBSetupFailed *) c->setup;
+ write(STDERR_FILENO, XCBSetupFailedReason(setup), XCBSetupFailedReasonLength(setup));
return 0;
}
case 2: /* authenticate */
{
- XCBConnSetupAuthenticateRep *setup = (XCBConnSetupAuthenticateRep *) c->setup;
- write(STDERR_FILENO, XCBConnSetupAuthenticateRepReason(setup), XCBConnSetupAuthenticateRepReasonLength(setup));
+ XCBSetupAuthenticate *setup = (XCBSetupAuthenticate *) c->setup;
+ write(STDERR_FILENO, XCBSetupAuthenticateReason(setup), XCBSetupAuthenticateReasonLength(setup));
return 0;
}
}
return 1;
}
+/* precondition: there must be something for us to write. */
+static int write_vec(XCBConnection *c, struct iovec **vector, int *count)
+{
+ int n;
+ assert(!c->out.queue_len);
+ n = writev(c->fd, *vector, *count);
+ if(n < 0 && errno == EAGAIN)
+ return 1;
+ if(n <= 0)
+ return 0;
+
+ for(; *count; --*count, ++*vector)
+ {
+ int cur = (*vector)->iov_len;
+ if(cur > n)
+ cur = n;
+ (*vector)->iov_len -= cur;
+ (*vector)->iov_base = (char *) (*vector)->iov_base + cur;
+ n -= cur;
+ if((*vector)->iov_len)
+ break;
+ }
+ if(!*count)
+ *vector = 0;
+ assert(n == 0);
+ return 1;
+}
+
/* Public interface */
-XCBConnSetupSuccessRep *XCBGetSetup(XCBConnection *c)
+const XCBSetup *XCBGetSetup(XCBConnection *c)
{
/* doesn't need locking because it's never written to. */
return c->setup;
return c->fd;
}
+int XCBConnectionHasError(XCBConnection *c)
+{
+ /* doesn't need locking because it's read and written atomically. */
+ return c->has_error;
+}
+
XCBConnection *XCBConnectToFD(int fd, XCBAuthInfo *auth_info)
{
XCBConnection* c;
/* Private interface */
-int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *cond)
+int _xcb_conn_wait(XCBConnection *c, pthread_cond_t *cond, struct iovec **vector, int *count)
{
int ret;
fd_set rfds, wfds;
/* If the thing I should be doing is already being done, wait for it. */
- if(should_write ? c->out.writing : c->in.reading)
+ if(count ? c->out.writing : c->in.reading)
{
pthread_cond_wait(cond, &c->iolock);
return 1;
++c->in.reading;
FD_ZERO(&wfds);
- if(should_write)
+ if(count)
{
FD_SET(c->fd, &wfds);
++c->out.writing;
}
pthread_mutex_unlock(&c->iolock);
- ret = select(c->fd + 1, &rfds, &wfds, 0, 0) > 0;
+ do {
+ ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
+ } while (ret == -1 && errno == EINTR);
+ if (ret < 0)
+ ret = 0;
pthread_mutex_lock(&c->iolock);
if(ret)
ret = ret && _xcb_in_read(c);
if(FD_ISSET(c->fd, &wfds))
- ret = ret && _xcb_out_write(c, &c->out.vec, &c->out.vec_len);
+ ret = ret && write_vec(c, vector, count);
}
- if(should_write)
+ if(count)
--c->out.writing;
--c->in.reading;
projects / free-sw / xcb / libxcb / blobdiff