diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2017-12-06 11:22:21 -0600 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2017-12-27 14:18:51 +0000 |
| commit | b4cf9e7d5e811a74812eb682512b3ef51c79f4af (patch) | |
| tree | 9e6d7e1ac2eaea946dfcd38437c82fe28b559a92 | |
| parent | connection: Make wl_closure_destroy() close fds of undispatched closures (diff) | |
| download | wayland-b4cf9e7d5e811a74812eb682512b3ef51c79f4af.tar wayland-b4cf9e7d5e811a74812eb682512b3ef51c79f4af.tar.gz wayland-b4cf9e7d5e811a74812eb682512b3ef51c79f4af.tar.bz2 wayland-b4cf9e7d5e811a74812eb682512b3ef51c79f4af.tar.lz wayland-b4cf9e7d5e811a74812eb682512b3ef51c79f4af.tar.xz wayland-b4cf9e7d5e811a74812eb682512b3ef51c79f4af.tar.zst wayland-b4cf9e7d5e811a74812eb682512b3ef51c79f4af.zip | |
util: Pass flags to map iterators
On the client side we're going to need to know if an object from the
map is a zombie before we attempt to dereference it, so we need to
pass this to the iterator.
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
| -rw-r--r-- | src/wayland-private.h | 3 | ||||
| -rw-r--r-- | src/wayland-server.c | 11 | ||||
| -rw-r--r-- | src/wayland-util.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/wayland-private.h b/src/wayland-private.h index 434cb04..93cec6b 100644 --- a/src/wayland-private.h +++ b/src/wayland-private.h @@ -80,7 +80,8 @@ struct wl_map { }; typedef enum wl_iterator_result (*wl_iterator_func_t)(void *element, - void *data); + void *data, + uint32_t flags); void wl_map_init(struct wl_map *map, uint32_t side); diff --git a/src/wayland-server.c b/src/wayland-server.c index 61e0315..cd5501f 100644 --- a/src/wayland-server.c +++ b/src/wayland-server.c @@ -658,11 +658,9 @@ resource_is_deprecated(struct wl_resource *resource) } static enum wl_iterator_result -destroy_resource(void *element, void *data) +destroy_resource(void *element, void *data, uint32_t flags) { struct wl_resource *resource = element; - struct wl_client *client = resource->client; - uint32_t flags; wl_signal_emit(&resource->deprecated_destroy_signal, resource); /* Don't emit the new signal for deprecated resources, as that would @@ -670,7 +668,6 @@ destroy_resource(void *element, void *data) if (!resource_is_deprecated(resource)) wl_priv_signal_emit(&resource->destroy_signal, resource); - flags = wl_map_lookup_flags(&client->objects, resource->object.id); if (resource->destroy) resource->destroy(resource); @@ -685,9 +682,11 @@ wl_resource_destroy(struct wl_resource *resource) { struct wl_client *client = resource->client; uint32_t id; + uint32_t flags; id = resource->object.id; - destroy_resource(resource, NULL); + flags = wl_map_lookup_flags(&client->objects, id); + destroy_resource(resource, NULL, flags); if (id < WL_SERVER_ID_START) { if (client->display_resource) { @@ -1839,7 +1838,7 @@ struct wl_resource_iterator_context { }; static enum wl_iterator_result -resource_iterator_helper(void *res, void *user_data) +resource_iterator_helper(void *res, void *user_data, uint32_t flags) { struct wl_resource_iterator_context *context = user_data; struct wl_resource *resource = res; diff --git a/src/wayland-util.c b/src/wayland-util.c index cab7fc5..ce387f4 100644 --- a/src/wayland-util.c +++ b/src/wayland-util.c @@ -371,7 +371,7 @@ for_each_helper(struct wl_array *entries, wl_iterator_func_t func, void *data) for (p = start; p < end; p++) if (p->data && !map_entry_is_free(*p)) { - ret = func(map_entry_get_data(*p), data); + ret = func(map_entry_get_data(*p), data, map_entry_get_flags(*p)); if (ret != WL_ITERATOR_CONTINUE) break; } |