mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-01 22:58:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support for flags in the wl_map API and add a WL_MAP_ENTRY_LEGACY flag

Browse source 
The implementation in this commit allows for one bit worth of flags.  If
more flags are desired at a future date, then the wl_map implementation
will have to change but the wl_map API will not.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Jason Ekstrand 2013-06-01 17:40:53 -05:00 • committed by Kristian Høgsberg
parent 28472970df
commit 2c7468b868
4 changed files with 58 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/wayland-util.c
View file

@ -151,6 +151,10 @@ union map_entry {
void *data;
};
#define map_entry_is_free(entry) ((entry).next & 0x1)
#define map_entry_get_data(entry) ((void *)((entry).next & ~(uintptr_t)0x3))
#define map_entry_get_flags(entry) (((entry).next >> 1) & 0x1)
WL_EXPORT void
wl_map_init(struct wl_map *map, uint32_t side)
{
@ -166,7 +170,7 @@ wl_map_release(struct wl_map *map)
}
WL_EXPORT uint32_t
wl_map_insert_new(struct wl_map *map, void *data)
wl_map_insert_new(struct wl_map *map, uint32_t flags, void *data)
{
union map_entry *start, *entry;
struct wl_array *entries;
@ -192,12 +196,13 @@ wl_map_insert_new(struct wl_map *map, void *data)
}
entry->data = data;
entry->next |= (flags & 0x1) << 1;
return (entry - start) + base;
}
WL_EXPORT int
wl_map_insert_at(struct wl_map *map, uint32_t i, void *data)
wl_map_insert_at(struct wl_map *map, uint32_t flags, uint32_t i, void *data)
{
union map_entry *start;
uint32_t count;
@ -225,6 +230,7 @@ wl_map_insert_at(struct wl_map *map, uint32_t i, void *data)
start = entries->data;
start[i].data = data;
start[i].next |= (flags & 0x1) << 1;
return 0;
}
@ -309,12 +315,35 @@ wl_map_lookup(struct wl_map *map, uint32_t i)
start = entries->data;
count = entries->size / sizeof *start;
if (i < count && !(start[i].next & 1))
return start[i].data;
if (i < count && !map_entry_is_free(start[i]))
return map_entry_get_data(start[i]);
return NULL;
}
WL_EXPORT uint32_t
wl_map_lookup_flags(struct wl_map *map, uint32_t i)
{
union map_entry *start;
uint32_t count;
struct wl_array *entries;
if (i < WL_SERVER_ID_START) {
entries = &map->client_entries;
} else {
entries = &map->server_entries;
i -= WL_SERVER_ID_START;
}
start = entries->data;
count = entries->size / sizeof *start;
if (i < count && !map_entry_is_free(start[i]))
return map_entry_get_flags(start[i]);
return 0;
}
static void
for_each_helper(struct wl_array *entries, wl_iterator_func_t func, void *data)
{
@ -324,8 +353,8 @@ for_each_helper(struct wl_array *entries, wl_iterator_func_t func, void *data)
end = (union map_entry *) ((char *) entries->data + entries->size);
for (p = start; p < end; p++)
if (p->data && !(p->next & 1))
func(p->data, data);
if (p->data && !map_entry_is_free(*p))
func(map_entry_get_data(*p), data);
}
WL_EXPORT void