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_request_check: Hold the I/O lock while deciding to sync.
[free-sw/xcb/libxcb]
/
src
/
xcb_in.c
diff --git
a/src/xcb_in.c
b/src/xcb_in.c
index
6dd358c
..
6fb9e3d
100644
(file)
--- a/
src/xcb_in.c
+++ b/
src/xcb_in.c
@@
-37,14
+37,25
@@
#include "xcbint.h"
#if USE_POLL
#include <poll.h>
#include "xcbint.h"
#if USE_POLL
#include <poll.h>
-#else
+#endif
+#ifndef _WIN32
#include <sys/select.h>
#include <sys/select.h>
+#include <sys/socket.h>
#endif
#endif
+#ifdef _WIN32
+#include "xcb_windefs.h"
+#endif /* _WIN32 */
+
#define XCB_ERROR 0
#define XCB_REPLY 1
#define XCB_XGE_EVENT 35
#define XCB_ERROR 0
#define XCB_REPLY 1
#define XCB_XGE_EVENT 35
+/* required for compiling for Win32 using MinGW */
+#ifndef MSG_WAITALL
+#define MSG_WAITALL 0
+#endif
+
struct event_list {
xcb_generic_event_t *event;
struct event_list *next;
struct event_list {
xcb_generic_event_t *event;
struct event_list *next;
@@
-255,10
+266,14
@@
static int read_block(const int fd, void *buf, const ssize_t len)
int done = 0;
while(done < len)
{
int done = 0;
while(done < len)
{
- int ret = re
ad(fd, ((char *) buf) + done, len - done
);
+ int ret = re
cv(fd, ((char *) buf) + done, len - done,MSG_WAITALL
);
if(ret > 0)
done += ret;
if(ret > 0)
done += ret;
+#ifndef _WIN32
if(ret < 0 && errno == EAGAIN)
if(ret < 0 && errno == EAGAIN)
+#else
+ if(ret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK)
+#endif /* !_Win32 */
{
#if USE_POLL
struct pollfd pfd;
{
#if USE_POLL
struct pollfd pfd;
@@
-272,10
+287,13
@@
static int read_block(const int fd, void *buf, const ssize_t len)
fd_set fds;
FD_ZERO(&fds);
FD_SET(fd, &fds);
fd_set fds;
FD_ZERO(&fds);
FD_SET(fd, &fds);
+
+ /* Initializing errno here makes sure that for Win32 this loop will execute only once */
+ errno = 0;
do {
ret = select(fd + 1, &fds, 0, 0, 0);
} while (ret == -1 && errno == EINTR);
do {
ret = select(fd + 1, &fds, 0, 0, 0);
} while (ret == -1 && errno == EINTR);
-#endif
+#endif
/* USE_POLL */
}
if(ret <= 0)
return ret;
}
if(ret <= 0)
return ret;
@@
-338,20
+356,10
@@
static int poll_for_reply(xcb_connection_t *c, unsigned int request, void **repl
return 1;
}
return 1;
}
-/* Public interface */
-
-void *xcb_wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_error_t **e)
+static void *wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_error_t **e)
{
{
- uint64_t widened_request;
void *ret = 0;
void *ret = 0;
- if(e)
- *e = 0;
- if(c->has_error)
- return 0;
-
- pthread_mutex_lock(&c->iolock);
-
- widened_request = (c->out.request & UINT64_C(0xffffffff00000000)) | request;
+ uint64_t widened_request = (c->out.request & UINT64_C(0xffffffff00000000)) | request;
if(widened_request > c->out.request)
widened_request -= UINT64_C(1) << 32;
if(widened_request > c->out.request)
widened_request -= UINT64_C(1) << 32;
@@
-393,6
+401,21
@@
void *xcb_wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_
}
_xcb_in_wake_up_next_reader(c);
}
_xcb_in_wake_up_next_reader(c);
+ return ret;
+}
+
+/* Public interface */
+
+void *xcb_wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_error_t **e)
+{
+ void *ret;
+ if(e)
+ *e = 0;
+ if(c->has_error)
+ return 0;
+
+ pthread_mutex_lock(&c->iolock);
+ ret = wait_for_reply(c, request, e);
pthread_mutex_unlock(&c->iolock);
return ret;
}
pthread_mutex_unlock(&c->iolock);
return ret;
}
@@
-557,21
+580,20
@@
xcb_generic_event_t *xcb_poll_for_event(xcb_connection_t *c)
xcb_generic_error_t *xcb_request_check(xcb_connection_t *c, xcb_void_cookie_t cookie)
{
xcb_generic_error_t *xcb_request_check(xcb_connection_t *c, xcb_void_cookie_t cookie)
{
- /* FIXME: this could hold the lock to avoid syncing unnecessarily, but
- * that would require factoring the locking out of xcb_get_input_focus,
- * xcb_get_input_focus_reply, and xcb_wait_for_reply. */
- xcb_generic_error_t *ret;
+ xcb_generic_error_t *ret = 0;
void *reply;
if(c->has_error)
return 0;
void *reply;
if(c->has_error)
return 0;
- if(XCB_SEQUENCE_COMPARE_32(cookie.sequence,>,c->in.request_expected)
+ pthread_mutex_lock(&c->iolock);
+ if(XCB_SEQUENCE_COMPARE_32(cookie.sequence,>=,c->in.request_expected)
&& XCB_SEQUENCE_COMPARE_32(cookie.sequence,>,c->in.request_completed))
{
&& XCB_SEQUENCE_COMPARE_32(cookie.sequence,>,c->in.request_completed))
{
-
free(xcb_get_input_focus_reply(c, xcb_get_input_focus(c), &ret)
);
-
assert(!re
t);
+
_xcb_out_send_sync(c
);
+
_xcb_out_flush_to(c, c->out.reques
t);
}
}
- reply =
xcb_
wait_for_reply(c, cookie.sequence, &ret);
+ reply = wait_for_reply(c, cookie.sequence, &ret);
assert(!reply);
assert(!reply);
+ pthread_mutex_unlock(&c->iolock);
return ret;
}
return ret;
}
@@
-663,12
+685,16
@@
void _xcb_in_replies_done(xcb_connection_t *c)
int _xcb_in_read(xcb_connection_t *c)
{
int _xcb_in_read(xcb_connection_t *c)
{
- int n = re
ad(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len
);
+ int n = re
cv(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len,MSG_WAITALL
);
if(n > 0)
c->in.queue_len += n;
while(read_packet(c))
/* empty */;
if(n > 0)
c->in.queue_len += n;
while(read_packet(c))
/* empty */;
+#ifndef _WIN32
if((n > 0) || (n < 0 && errno == EAGAIN))
if((n > 0) || (n < 0 && errno == EAGAIN))
+#else
+ if((n > 0) || (n < 0 && WSAGetLastError() == WSAEWOULDBLOCK))
+#endif /* !_WIN32 */
return 1;
_xcb_conn_shutdown(c);
return 0;
return 1;
_xcb_conn_shutdown(c);
return 0;