fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 23:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: switch ID allocation to util_idalloc_sparse to reduce virtual memory usage

Browse source 
If the max ID was allocated, it caused virtual memory usage to increase
to 512 MB. This commit reduced it to 512 KB.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10968

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30106>
This commit is contained in:
Marek Olšák 2024-07-10 10:39:25 -04:00 • committed by Marge Bot
parent d4085aaf56
commit 15461dc62f
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/mesa/main/hash.c
View file

@ -49,9 +49,9 @@ _mesa_InitHashTable(struct _mesa_HashTable *table)
{
memset(table, 0, sizeof(*table));
util_sparse_array_init(&table->array, sizeof(void*), 1024);
util_idalloc_init(&table->id_alloc, 8);
util_idalloc_sparse_init(&table->id_alloc);
/* Mark ID = 0 as used, so that we don't return it. */
util_idalloc_reserve(&table->id_alloc, 0);
util_idalloc_sparse_reserve(&table->id_alloc, 0);
simple_mtx_init(&table->Mutex, mtx_plain);
}
@ -75,13 +75,13 @@ _mesa_DeinitHashTable(struct _mesa_HashTable *table,
void *userData)
{
if (free_callback) {
util_idalloc_foreach_no_zero_safe(&table->id_alloc, id) {
util_idalloc_sparse_foreach_no_zero_safe(&table->id_alloc, id) {
free_callback(*(void**)util_sparse_array_get(&table->array, id),
userData);
}
}
util_idalloc_fini(&table->id_alloc);
util_idalloc_sparse_fini(&table->id_alloc);
util_sparse_array_finish(&table->array);
simple_mtx_destroy(&table->Mutex);
}
@ -115,7 +115,7 @@ _mesa_HashInsertLocked(struct _mesa_HashTable *table, GLuint key, void *data)
*(void**)util_sparse_array_get(&table->array, key) = data;
util_idalloc_reserve(&table->id_alloc, key);
util_idalloc_sparse_reserve(&table->id_alloc, key);
}
/**
@ -149,7 +149,7 @@ _mesa_HashRemoveLocked(struct _mesa_HashTable *table, GLuint key)
assert(key);
*(void**)util_sparse_array_get(&table->array, key) = NULL;
util_idalloc_free(&table->id_alloc, key);
util_idalloc_sparse_free(&table->id_alloc, key);
}
void
@ -174,7 +174,7 @@ _mesa_HashWalkLocked(struct _mesa_HashTable *table,
{
assert(callback);
util_idalloc_foreach_no_zero_safe(&table->id_alloc, id) {
util_idalloc_sparse_foreach_no_zero_safe(&table->id_alloc, id) {
callback(*(void**)util_sparse_array_get(&table->array, id), userData);
}
}
@ -207,7 +207,7 @@ _mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys)
{
const GLuint maxKey = ~((GLuint) 0) - 1;
if (table->alloc_via_idalloc) {
return util_idalloc_alloc_range(&table->id_alloc, numKeys);
return util_idalloc_sparse_alloc_range(&table->id_alloc, numKeys);
} else if (maxKey - numKeys > table->MaxKey) {
/* the quick solution */
return table->MaxKey + 1;
@ -248,7 +248,7 @@ _mesa_HashFindFreeKeys(struct _mesa_HashTable *table, GLuint* keys, GLuint numKe
}
for (int i = 0; i < numKeys; i++) {
keys[i] = util_idalloc_alloc(&table->id_alloc);
keys[i] = util_idalloc_sparse_alloc(&table->id_alloc);
}
return true;

4
src/mesa/main/hash.h
View file

@ -46,11 +46,11 @@
*/
struct _mesa_HashTable {
struct util_sparse_array array;
/* Used when name reuse is enabled */
struct util_idalloc id_alloc;
simple_mtx_t Mutex;
GLuint MaxKey; /**< highest key inserted so far */
bool alloc_via_idalloc;
/* Used when name reuse is enabled */
struct util_idalloc_sparse id_alloc;
};
void