KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/set: helper to remove entry by key 

v2: Add unit test. (Eric Anholt)

Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Caio Marcelo de Oliveira Filho 2018-06-25 13:42:22 -07:00 committed by Rafael Antognolli
parent b034facfbc
commit fa0c19d17b
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/set.c
View File

@ -383,6 +383,15 @@ _mesa_set_remove(struct set *ht, struct set_entry *entry)
ht->deleted_entries++;
}
/**
* Removes the entry with the corresponding key, if exists.
*/
void
_mesa_set_remove_key(struct set *set, const void *key)
{
_mesa_set_remove(set, _mesa_set_search(set, key));
}
/**
* This function is an iterator over the hash table.
*

2
src/util/set.h
View File

@ -81,6 +81,8 @@ _mesa_set_search_pre_hashed(const struct set *set, uint32_t hash,
void
_mesa_set_remove(struct set *set, struct set_entry *entry);
void
_mesa_set_remove_key(struct set *set, const void *key);
struct set_entry *
_mesa_set_next_entry(const struct set *set, struct set_entry *entry);

28
src/util/tests/set/set_test.cpp
View File

@ -85,3 +85,31 @@ TEST(set, clone)
_mesa_set_destroy(s, NULL);
_mesa_set_destroy(clone, NULL);
}
TEST(set, remove_key)
{
struct set *s = _mesa_set_create(NULL, _mesa_hash_pointer,
_mesa_key_pointer_equal);
const void *a = (const void *)10;
const void *b = (const void *)20;
const void *c = (const void *)30;
_mesa_set_add(s, a);
_mesa_set_add(s, b);
EXPECT_EQ(s->entries, 2);
/* Remove existing key. */
_mesa_set_remove_key(s, a);
EXPECT_EQ(s->entries, 1);
EXPECT_FALSE(_mesa_set_search(s, a));
EXPECT_TRUE(_mesa_set_search(s, b));
/* Remove non-existing key. */
_mesa_set_remove_key(s, c);
EXPECT_EQ(s->entries, 1);
EXPECT_FALSE(_mesa_set_search(s, a));
EXPECT_TRUE(_mesa_set_search(s, b));
_mesa_set_destroy(s, NULL);
}