mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: Log closure before sending it

Browse source 
This seems foolishly cosmetic on the surface - and will reorder log
messages in certain failure cases.  "request could not be marshalled"
will now appear after logging the request that failed to marshal
instead of before.

The real point of this is that a follow up patch will make
wl_closure_send() set fds to -1 as it buffers them for send, so
they can be more easily cleaned up.

Doing that while leaving this order unchanged would result in
printing -1 for fds instead of their value.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Derek Foreman 2017-12-06 11:22:17 -06:00 • committed by Daniel Stone
parent 9a2735c2b7
commit 383b2d965a
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/wayland-server.c
View file

@ -220,11 +220,11 @@ handle_array(struct wl_resource *resource, uint32_t opcode,
return; return;
} }
log_closure(resource, closure, true);
if (send_func(closure, resource->client->connection)) if (send_func(closure, resource->client->connection))
resource->client->error = 1; resource->client->error = 1;
log_closure(resource, closure, true);
wl_closure_destroy(closure); wl_closure_destroy(closure);
} }