projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove libxcb-xlib and xcbxlib.h.
[free-sw/xcb/libxcb]
/
src
/
xcb_conn.c
diff --git
a/src/xcb_conn.c
b/src/xcb_conn.c
index
3b315bc
..
2bb8661
100644
(file)
--- a/
src/xcb_conn.c
+++ b/
src/xcb_conn.c
@@
-59,25
+59,13
@@
static int set_fd_flags(const int fd)
return 1;
}
return 1;
}
-static int _xcb_xlib_init(_xcb_xlib *xlib)
-{
- xlib->lock = 0;
- 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];
xcb_setup_request_t out;
struct iovec parts[6];
int count = 0;
static int write_setup(xcb_connection_t *c, xcb_auth_info_t *auth_info)
{
static const char pad[3];
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));
@@
-107,7
+95,7
@@
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);
{
_xcb_lock_io(c);
{
@@
-227,7
+215,6
@@
xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info)
if(!(
set_fd_flags(fd) &&
pthread_mutex_init(&c->iolock, 0) == 0 &&
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) &&
_xcb_in_init(&c->in) &&
_xcb_out_init(&c->out) &&
write_setup(c, auth_info) &&
@@
-252,7
+239,6
@@
void xcb_disconnect(xcb_connection_t *c)
close(c->fd);
pthread_mutex_destroy(&c->iolock);
close(c->fd);
pthread_mutex_destroy(&c->iolock);
- _xcb_xlib_destroy(&c->xlib);
_xcb_in_destroy(&c->in);
_xcb_out_destroy(&c->out);
_xcb_in_destroy(&c->in);
_xcb_out_destroy(&c->out);
@@
-272,12
+258,6
@@
void _xcb_conn_shutdown(xcb_connection_t *c)
void _xcb_lock_io(xcb_connection_t *c)
{
pthread_mutex_lock(&c->iolock);
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)
}
void _xcb_unlock_io(xcb_connection_t *c)
@@
-285,6
+265,11
@@
void _xcb_unlock_io(xcb_connection_t *c)
pthread_mutex_unlock(&c->iolock);
}
pthread_mutex_unlock(&c->iolock);
}
+void _xcb_wait_io(xcb_connection_t *c, pthread_cond_t *cond)
+{
+ pthread_cond_wait(cond, &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;
@@
-293,7
+278,7
@@
int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec
/* 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)
{
-
pthread_cond_wait(cond, &c->iolock
);
+
_xcb_wait_io(c, cond
);
return 1;
}
return 1;
}