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

util: Pass flags to map iterators

Browse source 
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>
This commit is contained in:
Derek Foreman 2017-12-06 11:22:21 -06:00 • committed by Daniel Stone
parent 46e4ea43a2
commit b4cf9e7d5e
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/wayland-private.h
View file

@ -80,7 +80,8 @@ struct wl_map {
}; };
typedef enum wl_iterator_result (*wl_iterator_func_t)(void *element, typedef enum wl_iterator_result (*wl_iterator_func_t)(void *element,
void *data); void *data,
uint32_t flags);
void void
wl_map_init(struct wl_map *map, uint32_t side); wl_map_init(struct wl_map *map, uint32_t side);

11
src/wayland-server.c
View file

@ -658,11 +658,9 @@ resource_is_deprecated(struct wl_resource *resource)
} }
static enum wl_iterator_result 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_resource *resource = element;
struct wl_client *client = resource->client;
uint32_t flags;
wl_signal_emit(&resource->deprecated_destroy_signal, resource); wl_signal_emit(&resource->deprecated_destroy_signal, resource);
/* Don't emit the new signal for deprecated resources, as that would /* 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)) if (!resource_is_deprecated(resource))
wl_priv_signal_emit(&resource->destroy_signal, resource); wl_priv_signal_emit(&resource->destroy_signal, resource);
flags = wl_map_lookup_flags(&client->objects, resource->object.id);
if (resource->destroy) if (resource->destroy)
resource->destroy(resource); resource->destroy(resource);
@ -685,9 +682,11 @@ wl_resource_destroy(struct wl_resource *resource)
{ {
struct wl_client *client = resource->client; struct wl_client *client = resource->client;
uint32_t id; uint32_t id;
uint32_t flags;
id = resource->object.id; 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 (id < WL_SERVER_ID_START) {
if (client->display_resource) { if (client->display_resource) {
@ -1839,7 +1838,7 @@ struct wl_resource_iterator_context {
}; };
static enum wl_iterator_result 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_iterator_context *context = user_data;
struct wl_resource *resource = res; struct wl_resource *resource = res;

2
src/wayland-util.c
View file

@ -371,7 +371,7 @@ for_each_helper(struct wl_array *entries, wl_iterator_func_t func, void *data)
for (p = start; p < end; p++) for (p = start; p < end; p++)
if (p->data && !map_entry_is_free(*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) if (ret != WL_ITERATOR_CONTINUE)
break; break;
} }