projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xcb_disconnect: call shutdown() to force a disconnect
[free-sw/xcb/libxcb]
/
src
/
xcb_conn.c
diff --git
a/src/xcb_conn.c
b/src/xcb_conn.c
index
0176524
..
803f7aa
100644
(file)
--- a/
src/xcb_conn.c
+++ b/
src/xcb_conn.c
@@
-31,24
+31,33
@@
#include <unistd.h>
#include <stdlib.h>
#include <netinet/in.h>
#include <unistd.h>
#include <stdlib.h>
#include <netinet/in.h>
-#include <sys/select.h>
#include <fcntl.h>
#include <errno.h>
#include "xcb.h"
#include "xcbint.h"
#include <fcntl.h>
#include <errno.h>
#include "xcb.h"
#include "xcbint.h"
+#if USE_POLL
+#include <poll.h>
+#else
+#include <sys/select.h>
+#endif
+
+/* SHUT_RDWR is fairly recent and is not available on all platforms */
+#if !defined(SHUT_RDWR)
+#define SHUT_RDWR 2
+#endif
typedef struct {
typedef struct {
-
CARD8
status;
-
CARD8
pad0[5];
-
CARD16
length;
-}
XCBSetupGeneric
;
+
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)
{
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;
if(flags == -1)
return 0;
flags |= O_NONBLOCK;
@@
-59,13
+68,13
@@
static int set_fd_flags(const int fd)
return 1;
}
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];
{
static const char pad[3];
-
XCBSetupReq
out;
+
xcb_setup_request_t
out;
struct iovec parts[6];
int count = 0;
struct iovec parts[6];
int count = 0;
-
in
t endian = 0x01020304;
+
static const uint32_
t endian = 0x01020304;
int ret;
memset(&out, 0, sizeof(out));
int ret;
memset(&out, 0, sizeof(out));
@@
-79,9
+88,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;
out.protocol_minor_version = X_PROTOCOL_REVISION;
out.authorization_protocol_name_len = 0;
out.authorization_protocol_data_len = 0;
- parts[count].iov_len = sizeof(
XCBSetupReq
);
+ parts[count].iov_len = sizeof(
xcb_setup_request_t
);
parts[count++].iov_base = &out;
parts[count++].iov_base = &out;
- parts[count].iov_len = XCB_PAD(sizeof(
XCBSetupReq
));
+ parts[count].iov_len = XCB_PAD(sizeof(
xcb_setup_request_t
));
parts[count++].iov_base = (char *) pad;
if(auth_info)
parts[count++].iov_base = (char *) pad;
if(auth_info)
@@
-95,35
+104,32
@@
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;
}
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);
pthread_mutex_lock(&c->iolock);
- {
- struct iovec *parts_ptr = parts;
- ret = _xcb_out_send(c, &parts_ptr, &count);
- }
+ ret = _xcb_out_send(c, parts, count);
pthread_mutex_unlock(&c->iolock);
return ret;
}
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 */
{
/* Read the server response */
- c->setup = malloc(sizeof(
XCBSetupGeneric
));
+ c->setup = malloc(sizeof(
xcb_setup_generic_t
));
if(!c->setup)
return 0;
if(!c->setup)
return 0;
- if(_xcb_in_read_block(c, c->setup, sizeof(
XCBSetupGeneric)) != sizeof(XCBSetupGeneric
))
+ if(_xcb_in_read_block(c, c->setup, sizeof(
xcb_setup_generic_t)) != sizeof(xcb_setup_generic_t
))
return 0;
{
return 0;
{
- void *tmp = realloc(c->setup, c->setup->length * 4 + sizeof(
XCBSetupGeneric
));
+ void *tmp = realloc(c->setup, c->setup->length * 4 + sizeof(
xcb_setup_generic_t
));
if(!tmp)
return 0;
c->setup = tmp;
}
if(!tmp)
return 0;
c->setup = tmp;
}
- if(_xcb_in_read_block(c, (char *) c->setup + sizeof(
XCBSetupGeneric
), 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 */
return 0;
/* 0 = failed, 2 = authenticate, 1 = success */
@@
-131,15
+137,15
@@
static int read_setup(XCBConnection *c)
{
case 0: /* failed */
{
{
case 0: /* failed */
{
-
XCBSetupFailed *setup = (XCBSetupFailed
*) c->setup;
- write(STDERR_FILENO,
XCBSetupFailedReason(setup), XCBSetupFailedReasonL
ength(setup));
+
xcb_setup_failed_t *setup = (xcb_setup_failed_t
*) c->setup;
+ write(STDERR_FILENO,
xcb_setup_failed_reason(setup), xcb_setup_failed_reason_l
ength(setup));
return 0;
}
case 2: /* authenticate */
{
return 0;
}
case 2: /* authenticate */
{
-
XCBSetupAuthenticate *setup = (XCBSetupAuthenticate
*) c->setup;
- write(STDERR_FILENO,
XCBSetupAuthenticateReason(setup), XCBSetupAuthenticateReasonL
ength(setup));
+
xcb_setup_authenticate_t *setup = (xcb_setup_authenticate_t
*) c->setup;
+ write(STDERR_FILENO,
xcb_setup_authenticate_reason(setup), xcb_setup_authenticate_reason_l
ength(setup));
return 0;
}
}
return 0;
}
}
@@
-148,7
+154,7
@@
static int read_setup(XCBConnection *c)
}
/* precondition: there must be something for us to write. */
}
/* 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);
{
int n;
assert(!c->out.queue_len);
@@
-156,7
+162,10
@@
static int write_vec(XCBConnection *c, struct iovec **vector, int *count)
if(n < 0 && errno == EAGAIN)
return 1;
if(n <= 0)
if(n < 0 && errno == EAGAIN)
return 1;
if(n <= 0)
+ {
+ _xcb_conn_shutdown(c);
return 0;
return 0;
+ }
for(; *count; --*count, ++*vector)
{
for(; *count; --*count, ++*vector)
{
@@
-177,31
+186,45
@@
static int write_vec(XCBConnection *c, struct iovec **vector, int *count)
/* Public interface */
/* Public interface */
-const
XCBSetup *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;
}
/* 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;
}
/* doesn't need locking because it's never written to. */
return c->fd;
}
-int
XCBConnectionHasError(XCBConnection
*c)
+int
xcb_connection_has_error(xcb_connection_t
*c)
{
/* doesn't need locking because it's read and written atomically. */
return c->has_error;
}
{
/* doesn't need locking because it's read and written atomically. */
return c->has_error;
}
-
XCBConnection *XCBConnectToFD(int fd, XCBAuthInfo
*auth_info)
+
xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t
*auth_info)
{
{
- XCBConnection* c;
+ xcb_connection_t* c;
+
+#ifndef USE_POLL
+ if(fd >= FD_SETSIZE) /* would overflow in FD_SET */
+ {
+ close(fd);
+ return (xcb_connection_t *) &error_connection;
+ }
+#endif
- c = calloc(1, sizeof(XCBConnection));
- if(!c)
- return (XCBConnection *) &error_connection;
+ c = calloc(1, sizeof(xcb_connection_t));
+ if(!c) {
+ close(fd);
+ return (xcb_connection_t *) &error_connection;
+ }
c->fd = fd;
c->fd = fd;
@@
-216,19
+239,22
@@
XCBConnection *XCBConnectToFD(int fd, XCBAuthInfo *auth_info)
_xcb_xid_init(c)
))
{
_xcb_xid_init(c)
))
{
-
XCBD
isconnect(c);
- return (
XCBConnection
*) &error_connection;
+
xcb_d
isconnect(c);
+ return (
xcb_connection_t
*) &error_connection;
}
return c;
}
}
return c;
}
-void
XCBDisconnect(XCBConnection
*c)
+void
xcb_disconnect(xcb_connection_t
*c)
{
{
- if(
!c
)
+ if(
c->has_error
)
return;
free(c->setup);
return;
free(c->setup);
+
+ /* disallow further sends and receives */
+ shutdown(c->fd, SHUT_RDWR);
close(c->fd);
pthread_mutex_destroy(&c->iolock);
close(c->fd);
pthread_mutex_destroy(&c->iolock);
@@
-243,10
+269,19
@@
void XCBDisconnect(XCBConnection *c)
/* Private interface */
/* 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;
{
int ret;
+#if USE_POLL
+ struct pollfd fd;
+#else
fd_set rfds, wfds;
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)
/* If the thing I should be doing is already being done, wait for it. */
if(count ? c->out.writing : c->in.reading)
@@
-255,31
+290,60
@@
int _xcb_conn_wait(XCBConnection *c, pthread_cond_t *cond, struct iovec **vector
return 1;
}
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);
FD_ZERO(&rfds);
FD_SET(c->fd, &rfds);
+#endif
++c->in.reading;
++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;
}
FD_ZERO(&wfds);
if(count)
{
FD_SET(c->fd, &wfds);
++c->out.writing;
}
+#endif
pthread_mutex_unlock(&c->iolock);
do {
pthread_mutex_unlock(&c->iolock);
do {
- ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
+#if USE_POLL
+ ret = poll(&fd, 1, -1);
+#else
+ ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
+#endif
} while (ret == -1 && errno == EINTR);
} while (ret == -1 && errno == EINTR);
- if (ret < 0)
- ret = 0;
+ if(ret < 0)
+ {
+ _xcb_conn_shutdown(c);
+ ret = 0;
+ }
pthread_mutex_lock(&c->iolock);
if(ret)
{
pthread_mutex_lock(&c->iolock);
if(ret)
{
+#if USE_POLL
+ if((fd.revents & POLLIN) == POLLIN)
+#else
if(FD_ISSET(c->fd, &rfds))
if(FD_ISSET(c->fd, &rfds))
+#endif
ret = ret && _xcb_in_read(c);
ret = ret && _xcb_in_read(c);
+#if USE_POLL
+ if((fd.revents & POLLOUT) == POLLOUT)
+#else
if(FD_ISSET(c->fd, &wfds))
if(FD_ISSET(c->fd, &wfds))
+#endif
ret = ret && write_vec(c, vector, count);
}
ret = ret && write_vec(c, vector, count);
}