Mesa (master): mesa: create locked version of HashWalk
Timothy Arceri
tarceri at kemper.freedesktop.org
Mon Apr 24 23:59:05 UTC 2017
Module: Mesa
Branch: master
Commit: a82d6a307d0cfc1e4434bbecb1b308b94b1ca462
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a82d6a307d0cfc1e4434bbecb1b308b94b1ca462
Author: Timothy Arceri <tarceri at itsqueeze.com>
Date: Mon Apr 24 15:59:23 2017 +1000
mesa: create locked version of HashWalk
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
---
src/mesa/main/hash.c | 34 ++++++++++++++++++++++++++--------
src/mesa/main/hash.h | 5 +++++
2 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index b7a7bd9f64..a3772bdfb5 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -411,6 +411,23 @@ _mesa_HashDeleteAll(struct _mesa_HashTable *table,
* \param userData arbitrary pointer to pass along to the callback
* (this is typically a struct gl_context pointer)
*/
+static void
+hash_walk_unlocked(const struct _mesa_HashTable *table,
+ void (*callback)(GLuint key, void *data, void *userData),
+ void *userData)
+{
+ assert(table);
+ assert(callback);
+
+ struct hash_entry *entry;
+ hash_table_foreach(table->ht, entry) {
+ callback((uintptr_t)entry->key, entry->data, userData);
+ }
+ if (table->deleted_key_data)
+ callback(DELETED_KEY_VALUE, table->deleted_key_data, userData);
+}
+
+
void
_mesa_HashWalk(const struct _mesa_HashTable *table,
void (*callback)(GLuint key, void *data, void *userData),
@@ -418,19 +435,20 @@ _mesa_HashWalk(const struct _mesa_HashTable *table,
{
/* cast-away const */
struct _mesa_HashTable *table2 = (struct _mesa_HashTable *) table;
- struct hash_entry *entry;
- assert(table);
- assert(callback);
mtx_lock(&table2->Mutex);
- hash_table_foreach(table->ht, entry) {
- callback((uintptr_t)entry->key, entry->data, userData);
- }
- if (table->deleted_key_data)
- callback(DELETED_KEY_VALUE, table->deleted_key_data, userData);
+ hash_walk_unlocked(table, callback, userData);
mtx_unlock(&table2->Mutex);
}
+void
+_mesa_HashWalkLocked(const struct _mesa_HashTable *table,
+ void (*callback)(GLuint key, void *data, void *userData),
+ void *userData)
+{
+ hash_walk_unlocked(table, callback, userData);
+}
+
static void
debug_print_entry(GLuint key, void *data, void *userData)
{
diff --git a/src/mesa/main/hash.h b/src/mesa/main/hash.h
index 52a6c5d9dd..9eb0f0eac6 100644
--- a/src/mesa/main/hash.h
+++ b/src/mesa/main/hash.h
@@ -66,6 +66,11 @@ _mesa_HashWalk(const struct _mesa_HashTable *table,
void (*callback)(GLuint key, void *data, void *userData),
void *userData);
+extern void
+_mesa_HashWalkLocked(const struct _mesa_HashTable *table,
+ void (*callback)(GLuint key, void *data, void *userData),
+ void *userData);
+
extern void _mesa_HashPrint(const struct _mesa_HashTable *table);
extern GLuint _mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys);
More information about the mesa-commit
mailing list