projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Inline _xcb_lock_io, _xcb_unlock_io, and _xcb_wait_io.
[free-sw/xcb/libxcb]
/
src
/
xcb_conn.c
diff --git
a/src/xcb_conn.c
b/src/xcb_conn.c
index
3d18369
..
5b097f7
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;
@@
-65,7
+65,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
+95,14
@@
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
);
+
pthread_mutex_lock(&c->iolock
);
{
struct iovec *parts_ptr = parts;
ret = _xcb_out_send(c, &parts_ptr, &count);
}
{
struct iovec *parts_ptr = parts;
ret = _xcb_out_send(c, &parts_ptr, &count);
}
-
_xcb_unlock_io(c
);
+
pthread_mutex_unlock(&c->iolock
);
return ret;
}
return ret;
}
@@
-255,16
+255,6
@@
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;
@@
-288,7
+278,7
@@
int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec
++c->out.writing;
}
++c->out.writing;
}
-
_xcb_unlock_io(c
);
+
pthread_mutex_unlock(&c->iolock
);
do {
ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
} while (ret == -1 && errno == EINTR);
do {
ret = select(c->fd + 1, &rfds, &wfds, 0, 0);
} while (ret == -1 && errno == EINTR);
@@
-297,7
+287,7
@@
int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec
_xcb_conn_shutdown(c);
ret = 0;
}
_xcb_conn_shutdown(c);
ret = 0;
}
-
_xcb_lock_io(c
);
+
pthread_mutex_lock(&c->iolock
);
if(ret)
{
if(ret)
{