xcb_disconnect: call shutdown() to force a disconnect
Fixes the X Test Suite's XCloseDisplay-6 test, which has this (admittedly ridiculous) behavior: 1. Create a window w. 2. Open two display connections, dpy1, and dpy2. 3. Grab the server using dpy1. 4. Fork. 5 (child). XSetProperty on w using dpy2. 5 (parent). Verify that no event was recieved on dpy1. 6 (parent). XCloseDisplay(dpy1). 6 (child). Verify that an event was received on dpy2. It was failing because at step 6 (child), the server had not actually ungrabbed yet because the file descriptor for dpy1 was still open in the child process. Shutting down the socket during XCloseDisplay matches the behavior of non-XCB Xlib, which calls shutdown() from _X11TransSocketDisconnect. Thanks to Julien Cristau for noticing this. Signed-off-by: Aaron Plattner <aplattner at nvidia.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Peter Harris <pharris@opentext.com>
This commit is contained in:
parent
2040f10a4e
commit
7f5cfcc2fd
|
@ -42,6 +42,11 @@
|
|||
#include <sys/select.h>
|
||||
#endif
|
||||
|
||||
/* SHUT_RDWR is fairly recent and is not available on all platforms */
|
||||
#if !defined(SHUT_RDWR)
|
||||
#define SHUT_RDWR 2
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
uint8_t status;
|
||||
uint8_t pad0[5];
|
||||
|
@ -247,6 +252,9 @@ void xcb_disconnect(xcb_connection_t *c)
|
|||
return;
|
||||
|
||||
free(c->setup);
|
||||
|
||||
/* disallow further sends and receives */
|
||||
shutdown(c->fd, SHUT_RDWR);
|
||||
close(c->fd);
|
||||
|
||||
pthread_mutex_destroy(&c->iolock);
|
||||
|
|
Loading…
Reference in New Issue