fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

util/set: improve support for usage without "set" structure allocation

Browse source 
The set can be used without allocating the "set" structure, so let's
add missing init and fini functions.

Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36728>
This commit is contained in:
Marek Olšák 2025-08-09 16:13:29 -04:00 • committed by Marge Bot
parent b53682f41b
commit 9efee5f75f
2 changed files with 47 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/util/set.c
View file

@ -137,6 +137,14 @@ _mesa_set_init(struct set *ht, void *mem_ctx,
return ht->table != NULL;
}
bool
_mesa_pointer_set_init(struct set *ht, void *mem_ctx)
{
return _mesa_set_init(ht, mem_ctx, _mesa_hash_pointer,
_mesa_key_pointer_equal);
}
/* It's preferred to use _mesa_set_init instead of this to skip ralloc. */
struct set *
_mesa_set_create(void *mem_ctx,
uint32_t (*key_hash_function)(const void *key),
@ -170,7 +178,14 @@ key_u32_equals(const void *a, const void *b)
return (uint32_t)(uintptr_t)a == (uint32_t)(uintptr_t)b;
}
bool
_mesa_u32_set_init(struct set *ht, void *mem_ctx)
{
return _mesa_set_init(ht, mem_ctx, key_u32_hash, key_u32_equals);
}
/* key == 0 and key == deleted_key are not allowed */
/* It's preferred to use _mesa_u32_set_init instead of this to skip ralloc. */
struct set *
_mesa_set_create_u32_keys(void *mem_ctx)
{
@ -199,6 +214,26 @@ _mesa_set_clone(struct set *set, void *dst_mem_ctx)
return clone;
}
/**
* Deallocates the internal table. This is optional and doesn't need to be
* called when:
* - you don't need to call delete_function
* - the initial ralloc context is non-NULL, meaning it gets freed
* automatically when the ralloc parent is freed.
*/
void
_mesa_set_fini(struct set *ht,
void (*delete_function)(struct set_entry *entry))
{
if (delete_function) {
set_foreach (ht, entry) {
delete_function(entry);
}
}
ralloc_free(ht->table);
ht->table = NULL;
}
/**
* Frees the given set.
*
@ -211,12 +246,7 @@ _mesa_set_destroy(struct set *ht, void (*delete_function)(struct set_entry *entr
if (!ht)
return;
if (delete_function) {
set_foreach (ht, entry) {
delete_function(entry);
}
}
ralloc_free(ht->table);
_mesa_set_fini(ht, delete_function);
ralloc_free(ht);
}
@ -605,6 +635,7 @@ _mesa_set_next_entry(const struct set *ht, struct set_entry *entry)
}
/**
* It's preferred to use _mesa_pointer_set_init instead of this to skip ralloc.
* Helper to create a set with pointer keys.
*/
struct set *

10
src/util/set.h
View file

@ -61,6 +61,16 @@ _mesa_set_init(struct set *ht, void *mem_ctx,
bool (*key_equals_function)(const void *a,
const void *b));
void
_mesa_set_fini(struct set *ht,
void (*delete_function)(struct set_entry *entry));
bool
_mesa_pointer_set_init(struct set *ht, void *mem_ctx);
bool
_mesa_u32_set_init(struct set *ht, void *mem_ctx);
struct set *
_mesa_set_create(void *mem_ctx,
uint32_t (*key_hash_function)(const void *key),