X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_conn.c;h=251d62e01dbf63161c7339deedac59fe66fc90b0;hb=e82c34c2f7ac3fbb23ab14cbee8df2dd9178f5a4;hp=792dfb85cb5c6ea341ea2ae865c53ed1b772cb14;hpb=83e652f566671f96ffc53a3c0099a84a1606c695;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_conn.c b/src/xcb_conn.c index 792dfb8..251d62e 100644 --- a/src/xcb_conn.c +++ b/src/xcb_conn.c @@ -31,15 +31,28 @@ #include #include #include -#include -#include +#include +#include #include "xcb.h" #include "xcbint.h" +#if USE_POLL +#include +#else +#include +#endif + +typedef struct { + uint8_t status; + uint8_t pad0[5]; + uint16_t length; +} xcb_setup_generic_t; + +static const int error_connection = 1; static int set_fd_flags(const int fd) { - long flags = fcntl(fd, F_GETFL, 0); + int flags = fcntl(fd, F_GETFL, 0); if(flags == -1) return 0; flags |= O_NONBLOCK; @@ -50,13 +63,13 @@ static int set_fd_flags(const int fd) return 1; } -static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info) +static int write_setup(xcb_connection_t *c, xcb_auth_info_t *auth_info) { static const char pad[3]; - XCBConnSetupReq out; + xcb_setup_request_t out; struct iovec parts[6]; int count = 0; - int endian = 0x01020304; + static const uint32_t endian = 0x01020304; int ret; memset(&out, 0, sizeof(out)); @@ -70,49 +83,51 @@ static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info) 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(xcb_setup_request_t); 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(xcb_setup_request_t)); + 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)); + assert(count <= (int) (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) +static int read_setup(xcb_connection_t *c) { /* Read the server response */ - c->setup = malloc(sizeof(XCBConnSetupGenericRep)); + c->setup = malloc(sizeof(xcb_setup_generic_t)); 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(xcb_setup_generic_t)) != sizeof(xcb_setup_generic_t)) return 0; { - void *tmp = realloc(c->setup, c->setup->length * 4 + sizeof(XCBConnSetupGenericRep)); + void *tmp = realloc(c->setup, c->setup->length * 4 + sizeof(xcb_setup_generic_t)); 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(xcb_setup_generic_t), c->setup->length * 4) <= 0) return 0; /* 0 = failed, 2 = authenticate, 1 = success */ @@ -120,15 +135,15 @@ static int read_setup(XCBConnection *c) { case 0: /* failed */ { - XCBConnSetupFailedRep *setup = (XCBConnSetupFailedRep *) c->setup; - write(STDERR_FILENO, XCBConnSetupFailedRepReason(setup), XCBConnSetupFailedRepReasonLength(setup)); + xcb_setup_failed_t *setup = (xcb_setup_failed_t *) c->setup; + write(STDERR_FILENO, xcb_setup_failed_reason(setup), xcb_setup_failed_reason_length(setup)); return 0; } case 2: /* authenticate */ { - XCBConnSetupAuthenticateRep *setup = (XCBConnSetupAuthenticateRep *) c->setup; - write(STDERR_FILENO, XCBConnSetupAuthenticateRepReason(setup), XCBConnSetupAuthenticateRepReasonLength(setup)); + xcb_setup_authenticate_t *setup = (xcb_setup_authenticate_t *) c->setup; + write(STDERR_FILENO, xcb_setup_authenticate_reason(setup), xcb_setup_authenticate_reason_length(setup)); return 0; } } @@ -136,27 +151,68 @@ static int read_setup(XCBConnection *c) return 1; } +/* precondition: there must be something for us to write. */ +static int write_vec(xcb_connection_t *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) + { + _xcb_conn_shutdown(c); + 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 xcb_setup_t *xcb_get_setup(xcb_connection_t *c) { + if(c->has_error) + return 0; /* doesn't need locking because it's never written to. */ return c->setup; } -int XCBGetFileDescriptor(XCBConnection *c) +int xcb_get_file_descriptor(xcb_connection_t *c) { + if(c->has_error) + return -1; /* doesn't need locking because it's never written to. */ return c->fd; } -XCBConnection *XCBConnectToFD(int fd, XCBAuthInfo *auth_info) +int xcb_connection_has_error(xcb_connection_t *c) +{ + /* doesn't need locking because it's read and written atomically. */ + return c->has_error; +} + +xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info) { - XCBConnection* c; + xcb_connection_t* c; - c = calloc(1, sizeof(XCBConnection)); + c = calloc(1, sizeof(xcb_connection_t)); if(!c) - return 0; + return (xcb_connection_t *) &error_connection; c->fd = fd; @@ -171,16 +227,16 @@ XCBConnection *XCBConnectToFD(int fd, XCBAuthInfo *auth_info) _xcb_xid_init(c) )) { - XCBDisconnect(c); - return 0; + xcb_disconnect(c); + return (xcb_connection_t *) &error_connection; } return c; } -void XCBDisconnect(XCBConnection *c) +void xcb_disconnect(xcb_connection_t *c) { - if(!c) + if(c->has_error) return; free(c->setup); @@ -198,10 +254,19 @@ void XCBDisconnect(XCBConnection *c) /* Private interface */ -int _xcb_conn_wait(XCBConnection *c, pthread_cond_t *cond, struct iovec **vector, int *count) +void _xcb_conn_shutdown(xcb_connection_t *c) +{ + c->has_error = 1; +} + +int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count) { int ret; +#if USE_POLL + struct pollfd fd; +#else fd_set rfds, wfds; +#endif /* If the thing I should be doing is already being done, wait for it. */ if(count ? c->out.writing : c->in.reading) @@ -210,28 +275,61 @@ int _xcb_conn_wait(XCBConnection *c, pthread_cond_t *cond, struct iovec **vector return 1; } +#if USE_POLL + memset(&fd, 0, sizeof(fd)); + fd.fd = c->fd; + fd.events = POLLIN; +#else FD_ZERO(&rfds); FD_SET(c->fd, &rfds); +#endif ++c->in.reading; +#if USE_POLL + if(count) + { + fd.events |= POLLOUT; + ++c->out.writing; + } +#else FD_ZERO(&wfds); if(count) { FD_SET(c->fd, &wfds); ++c->out.writing; } +#endif pthread_mutex_unlock(&c->iolock); - ret = select(c->fd + 1, &rfds, &wfds, 0, 0) > 0; + do { +#if USE_POLL + ret = poll(&fd, 1, -1); +#else + ret = select(c->fd + 1, &rfds, &wfds, 0, 0); +#endif + } while (ret == -1 && errno == EINTR); + if (ret < 0) + { + _xcb_conn_shutdown(c); + ret = 0; + } pthread_mutex_lock(&c->iolock); if(ret) { +#if USE_POLL + if((fd.revents & POLLIN) == POLLIN) +#else if(FD_ISSET(c->fd, &rfds)) +#endif ret = ret && _xcb_in_read(c); +#if USE_POLL + if((fd.revents & POLLOUT) == POLLOUT) +#else if(FD_ISSET(c->fd, &wfds)) - ret = ret && _xcb_out_write(c, vector, count); +#endif + ret = ret && write_vec(c, vector, count); } if(count)