X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_conn.c;h=02f60bd91c53b5e2c1560e3444f8445d8c3701bc;hb=6438584285de72858f97be891e16a125d13471d8;hp=1e9313773e29741bee9df6a783a30be52054a0dd;hpb=f5c4956a81ed5aee3ea46e91785ec14f82e205d5;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_conn.c b/src/xcb_conn.c index 1e93137..02f60bd 100644 --- a/src/xcb_conn.c +++ b/src/xcb_conn.c @@ -32,15 +32,23 @@ #include #include #include -#include +#include #include #include "xcb.h" #include "xcbint.h" +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; @@ -51,13 +59,28 @@ static int set_fd_flags(const int fd) return 1; } -static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info) +static int _xcb_xlib_init(_xcb_xlib *xlib) +{ + xlib->lock = 0; +#ifndef NDEBUG + xlib->sloppy_lock = (getenv("LIBXCB_ALLOW_SLOPPY_LOCK") != 0); +#endif + pthread_cond_init(&xlib->cond, 0); + return 1; +} + +static void _xcb_xlib_destroy(_xcb_xlib *xlib) +{ + pthread_cond_destroy(&xlib->cond); +} + +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)); @@ -71,9 +94,9 @@ 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_len = XCB_PAD(sizeof(xcb_setup_request_t)); parts[count++].iov_base = (char *) pad; if(auth_info) @@ -87,35 +110,35 @@ static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info) parts[count].iov_len = XCB_PAD(out.authorization_protocol_data_len); 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_lock_io(c); { struct iovec *parts_ptr = parts; ret = _xcb_out_send(c, &parts_ptr, &count); } - pthread_mutex_unlock(&c->iolock); + _xcb_unlock_io(c); 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 */ @@ -123,15 +146,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; } } @@ -140,7 +163,7 @@ static int read_setup(XCBConnection *c) } /* precondition: there must be something for us to write. */ -static int write_vec(XCBConnection *c, struct iovec **vector, int *count) +static int write_vec(xcb_connection_t *c, struct iovec **vector, int *count) { int n; assert(!c->out.queue_len); @@ -148,7 +171,10 @@ static int write_vec(XCBConnection *c, struct iovec **vector, int *count) if(n < 0 && errno == EAGAIN) return 1; if(n <= 0) + { + _xcb_conn_shutdown(c); return 0; + } for(; *count; --*count, ++*vector) { @@ -169,31 +195,42 @@ static int write_vec(XCBConnection *c, struct iovec **vector, int *count) /* Public interface */ -const 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; if(!( set_fd_flags(fd) && pthread_mutex_init(&c->iolock, 0) == 0 && + _xcb_xlib_init(&c->xlib) && _xcb_in_init(&c->in) && _xcb_out_init(&c->out) && write_setup(c, auth_info) && @@ -202,22 +239,23 @@ 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); close(c->fd); pthread_mutex_destroy(&c->iolock); + _xcb_xlib_destroy(&c->xlib); _xcb_in_destroy(&c->in); _xcb_out_destroy(&c->out); @@ -229,15 +267,54 @@ 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) { - int ret; + c->has_error = 1; +} + +void _xcb_lock_io(xcb_connection_t *c) +{ + pthread_mutex_lock(&c->iolock); + while(c->xlib.lock) + { + if(pthread_equal(c->xlib.thread, pthread_self())) + break; + pthread_cond_wait(&c->xlib.cond, &c->iolock); + } +} + +void _xcb_unlock_io(xcb_connection_t *c) +{ + pthread_mutex_unlock(&c->iolock); +} + +void _xcb_wait_io(xcb_connection_t *c, pthread_cond_t *cond) +{ + int xlib_locked = c->xlib.lock; + if(xlib_locked) + { + c->xlib.lock = 0; + pthread_cond_broadcast(&c->xlib.cond); + } + pthread_cond_wait(cond, &c->iolock); + if(xlib_locked) + { + while(c->xlib.lock) + pthread_cond_wait(&c->xlib.cond, &c->iolock); + c->xlib.lock = 1; + c->xlib.thread = pthread_self(); + } +} + +int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count) +{ + int ret, xlib_locked; fd_set rfds, wfds; /* If the thing I should be doing is already being done, wait for it. */ if(count ? c->out.writing : c->in.reading) { - pthread_cond_wait(cond, &c->iolock); + _xcb_wait_io(c, cond); return 1; } @@ -252,9 +329,27 @@ int _xcb_conn_wait(XCBConnection *c, pthread_cond_t *cond, struct iovec **vector ++c->out.writing; } - pthread_mutex_unlock(&c->iolock); - ret = select(c->fd + 1, &rfds, &wfds, 0, 0) > 0; - pthread_mutex_lock(&c->iolock); + xlib_locked = c->xlib.lock; + if(xlib_locked) + { + c->xlib.lock = 0; + pthread_cond_broadcast(&c->xlib.cond); + } + _xcb_unlock_io(c); + do { + ret = select(c->fd + 1, &rfds, &wfds, 0, 0); + } while (ret == -1 && errno == EINTR); + if (ret < 0) + { + _xcb_conn_shutdown(c); + ret = 0; + } + _xcb_lock_io(c); + if(xlib_locked) + { + c->xlib.lock = 1; + c->xlib.thread = pthread_self(); + } if(ret) {