AcoSail/wayland
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

tests: Synchronize client termination in idle callback

Browse Source 
We currently wait for clients in the wl_client destroy signal, which is
called before the client is destructed and the socket is closed. If test
clients rely on being closed due to the socket being closed we'd dead
lock. Avoid this by synchronizing in an idle task that is called after
the client is fully destroyed.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Jonas Ådahl 2015-12-24 12:41:46 +08:00
parent 242617c316
commit 7efe8fbd89
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/test-compositor.c
View File

@ -91,17 +91,13 @@ get_socket_name(void)
return retval; return retval;
} }
/**
* Check client's state and terminate display when all clients exited
*/
static void static void
client_destroyed(struct wl_listener *listener, void *data) handle_client_destroy(void *data)
{ {
struct client_info *ci = data;
struct display *d; struct display *d;
struct client_info *ci;
siginfo_t status; siginfo_t status;
ci = wl_container_of(listener, ci, destroy_listener);
d = ci->display; d = ci->display;
assert(waitid(P_PID, ci->pid, &status, WEXITED) != -1); assert(waitid(P_PID, ci->pid, &status, WEXITED) != -1);
@ -132,6 +128,25 @@ client_destroyed(struct wl_listener *listener, void *data)
* clients. In the case that the test would go through * clients. In the case that the test would go through
* the clients list manually, zero out the wl_client as a sign * the clients list manually, zero out the wl_client as a sign
* that the client is not running anymore */ * that the client is not running anymore */
}
/**
* Check client's state and terminate display when all clients exited
*/
static void
client_destroyed(struct wl_listener *listener, void *data)
{
struct client_info *ci;
struct display *d;
struct wl_event_loop *loop;
/* Wait for client in an idle handler to avoid blocking the actual
* client destruction (fd close etc. */
ci = wl_container_of(listener, ci, destroy_listener);
d = ci->display;
loop = wl_display_get_event_loop(d->wl_display);
wl_event_loop_add_idle(loop, handle_client_destroy, ci);
ci->wl_client = NULL; ci->wl_client = NULL;
} }