projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added generating code for _serialize() in case of variable sized structs (largely...
[free-sw/xcb/libxcb]
/
src
/
xcb_conn.c
diff --git
a/src/xcb_conn.c
b/src/xcb_conn.c
index
3d18369
..
50a662b
100644
(file)
--- a/
src/xcb_conn.c
+++ b/
src/xcb_conn.c
@@
-31,12
+31,16
@@
#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
typedef struct {
uint8_t status;
typedef struct {
uint8_t status;
@@
-48,7
+52,7
@@
static const int error_connection = 1;
static int set_fd_flags(const int fd)
{
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;
@@
-65,7
+69,7
@@
static int write_setup(xcb_connection_t *c, xcb_auth_info_t *auth_info)
xcb_setup_request_t out;
struct iovec parts[6];
int count = 0;
xcb_setup_request_t out;
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));
@@
-95,14
+99,11
@@
static int write_setup(xcb_connection_t *c, xcb_auth_info_t *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)
));
- _xcb_lock_io(c);
- {
- struct iovec *parts_ptr = parts;
- ret = _xcb_out_send(c, &parts_ptr, &count);
- }
- _xcb_unlock_io(c);
+ pthread_mutex_lock(&c->iolock);
+ ret = _xcb_out_send(c, parts, count);
+ pthread_mutex_unlock(&c->iolock);
return ret;
}
return ret;
}
@@
-206,9
+207,19
@@
xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info)
{
xcb_connection_t* 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(xcb_connection_t));
c = calloc(1, sizeof(xcb_connection_t));
- if(!c)
+ if(!c) {
+ close(fd);
return (xcb_connection_t *) &error_connection;
return (xcb_connection_t *) &error_connection;
+ }
c->fd = fd;
c->fd = fd;
@@
-255,20
+266,14
@@
void _xcb_conn_shutdown(xcb_connection_t *c)
c->has_error = 1;
}
c->has_error = 1;
}
-void _xcb_lock_io(xcb_connection_t *c)
-{
- pthread_mutex_lock(&c->iolock);
-}
-
-void _xcb_unlock_io(xcb_connection_t *c)
-{
- pthread_mutex_unlock(&c->iolock);
-}
-
int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count)
{
int ret;
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;
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)
@@
-277,34
+282,60
@@
int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec
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
-
_xcb_unlock_io(c
);
+
pthread_mutex_unlock(&c->iolock
);
do {
do {
+#if USE_POLL
+ ret = poll(&fd, 1, -1);
+#else
ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
+#endif
} while (ret == -1 && errno == EINTR);
if (ret < 0)
{
_xcb_conn_shutdown(c);
ret = 0;
}
} while (ret == -1 && errno == EINTR);
if (ret < 0)
{
_xcb_conn_shutdown(c);
ret = 0;
}
-
_xcb_lock_io(c
);
+
pthread_mutex_lock(&c->iolock
);
if(ret)
{
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);
}