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
/
xcbint.h
diff --git
a/src/xcbint.h
b/src/xcbint.h
index
d81e787
..
ab0264f
100644
(file)
--- a/
src/xcbint.h
+++ b/
src/xcbint.h
@@
-28,6
+28,8
@@
#ifndef __XCBINT_H
#define __XCBINT_H
#ifndef __XCBINT_H
#define __XCBINT_H
+#include "bigreq.h"
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@
-41,6
+43,13
@@
enum workarounds {
WORKAROUND_GLX_GET_FB_CONFIGS_BUG
};
WORKAROUND_GLX_GET_FB_CONFIGS_BUG
};
+enum lazy_reply_tag
+{
+ LAZY_NONE = 0,
+ LAZY_COOKIE,
+ LAZY_FORCED
+};
+
#define XCB_PAD(i) (-(i) & 3)
#define XCB_SEQUENCE_COMPARE(a,op,b) ((int) ((a) - (b)) op 0)
#define XCB_PAD(i) (-(i) & 3)
#define XCB_SEQUENCE_COMPARE(a,op,b) ((int) ((a) - (b)) op 0)
@@
-70,7
+79,11
@@
typedef struct _xcb_out {
unsigned int request_written;
pthread_mutex_t reqlenlock;
unsigned int request_written;
pthread_mutex_t reqlenlock;
- uint32_t maximum_request_length;
+ enum lazy_reply_tag maximum_request_length_tag;
+ union {
+ xcb_big_requests_enable_cookie_t cookie;
+ uint32_t value;
+ } maximum_request_length;
} _xcb_out;
int _xcb_out_init(_xcb_out *out);
} _xcb_out;
int _xcb_out_init(_xcb_out *out);
@@
-117,6
+130,7
@@
int _xcb_in_read_block(xcb_connection_t *c, void *buf, int nread);
typedef struct _xcb_xlib {
int lock;
typedef struct _xcb_xlib {
int lock;
+ int sloppy_lock;
pthread_t thread;
pthread_cond_t cond;
} _xcb_xlib;
pthread_t thread;
pthread_cond_t cond;
} _xcb_xlib;
@@
-169,12
+183,13
@@
struct xcb_connection_t {
};
void _xcb_conn_shutdown(xcb_connection_t *c);
};
void _xcb_conn_shutdown(xcb_connection_t *c);
+void _xcb_wait_io(xcb_connection_t *c, pthread_cond_t *cond);
int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count);
/* xcb_auth.c */
int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count);
/* xcb_auth.c */
-int _xcb_get_auth_info(int fd, xcb_auth_info_t *info);
+int _xcb_get_auth_info(int fd, xcb_auth_info_t *info
, int display
);
#ifdef GCC_HAS_VISIBILITY
#pragma GCC visibility pop
#ifdef GCC_HAS_VISIBILITY
#pragma GCC visibility pop