projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Factor pthread_cond_wait(iolock) to _xcb_wait_io.
[free-sw/xcb/libxcb]
/
src
/
xcb_conn.c
diff --git
a/src/xcb_conn.c
b/src/xcb_conn.c
index
239d71b
..
9a58bff
100644
(file)
--- a/
src/xcb_conn.c
+++ b/
src/xcb_conn.c
@@
-48,7
+48,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;
@@
-62,6
+62,9
@@
static int set_fd_flags(const int fd)
static int _xcb_xlib_init(_xcb_xlib *xlib)
{
xlib->lock = 0;
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;
}
pthread_cond_init(&xlib->cond, 0);
return 1;
}
@@
-285,6
+288,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
+301,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;
}