blankhex/bhlib
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change code and naming style, fix several bugs, removed math types.

Browse Source 
After a while I felt that putting underscores between words was not the
best solution, so I changed the underscores to capital letters.

Fixed consistency bug between POSIX/Win32 platform in BH_FileOpen.

Removed definitions for math types (vector, matrix, etc.) due to
potential aliasing issues.
This commit is contained in:
Mikhail Romanko
2025-01-30 13:53:26 +03:00
parent 8d73a9b473
commit c89cf8f316
22 changed files with 3400 additions and 4135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

190
test/src/testhashmap.c
View File

@@ -2,161 +2,161 @@
#include <bh/unit.h>
static size_t direct_hash(const void *ptr)
static size_t DBG_PtrIntHash(const void *ptr)
{
return BH_PTR2INT(ptr);
}
static int direct_equal(const void *lhs, const void *rhs)
static int DBG_PtrIntEqual(const void *lhs, const void *rhs)
{
return BH_PTR2INT(lhs) - BH_PTR2INT(rhs);
}
static int new_free(void)
static int NewFree(void)
{
bh_hashmap_t *hashmap;
BH_Hashmap *hashmap;
hashmap = bh_hashmap_new(direct_equal, direct_hash);
hashmap = BH_HashmapNew(DBG_PtrIntEqual, DBG_PtrIntHash);
BH_VERIFY(hashmap != NULL);
BH_VERIFY(bh_hashmap_empty(hashmap) != 0);
BH_VERIFY(bh_hashmap_size(hashmap) == 0);
BH_VERIFY(bh_hashmap_capacity(hashmap) == 0);
BH_VERIFY(bh_hashmap_factor(hashmap) >= 0.15f);
BH_VERIFY(bh_hashmap_factor(hashmap) <= 1.0f);
BH_VERIFY(BH_HashmapEmpty(hashmap) != 0);
BH_VERIFY(BH_HashmapSize(hashmap) == 0);
BH_VERIFY(BH_HashmapCapacity(hashmap) == 0);
BH_VERIFY(BH_HashmapFactor(hashmap) >= 0.15f);
BH_VERIFY(BH_HashmapFactor(hashmap) <= 1.0f);
bh_hashmap_free(hashmap);
BH_HashmapFree(hashmap);
return 0;
}
static int grow_shrink(void)
static int GrowShrink(void)
{
bh_hashmap_t *hashmap;
BH_Hashmap *hashmap;
void *iter;
hashmap = bh_hashmap_new(direct_equal, direct_hash);
hashmap = BH_HashmapNew(DBG_PtrIntEqual, DBG_PtrIntHash);
BH_VERIFY(hashmap != NULL);
/* Allocate space for 1024 entries and insert 1 element */
BH_VERIFY(bh_hashmap_reserve(hashmap, 1024) == 0);
BH_VERIFY(bh_hashmap_insert(hashmap, BH_INT2PTR(1337), BH_INT2PTR(80085)) == 0);
BH_VERIFY(BH_HashmapReserve(hashmap, 1024) == 0);
BH_VERIFY(BH_HashmapInsert(hashmap, BH_INT2PTR(1337), BH_INT2PTR(80085)) == 0);
/* Check hashmap contents */
iter = bh_hashmap_iter_next(hashmap, NULL);
iter = BH_HashmapIterNext(hashmap, NULL);
BH_VERIFY(iter != NULL);
BH_VERIFY(BH_PTR2INT(bh_hashmap_iter_key(iter)) == 1337);
BH_VERIFY(BH_PTR2INT(bh_hashmap_iter_value(iter)) == 80085);
BH_VERIFY(bh_hashmap_iter_next(hashmap, iter) == NULL);
BH_VERIFY(bh_hashmap_empty(hashmap) == 0);
BH_VERIFY(bh_hashmap_size(hashmap) == 1);
BH_VERIFY(bh_hashmap_capacity(hashmap) >= 1024);
BH_VERIFY(BH_PTR2INT(BH_HashmapIterKey(iter)) == 1337);
BH_VERIFY(BH_PTR2INT(BH_HashmapIterValue(iter)) == 80085);
BH_VERIFY(BH_HashmapIterNext(hashmap, iter) == NULL);
BH_VERIFY(BH_HashmapEmpty(hashmap) == 0);
BH_VERIFY(BH_HashmapSize(hashmap) == 1);
BH_VERIFY(BH_HashmapCapacity(hashmap) >= 1024);
/* Change factor and grow */
bh_hashmap_set_factor(hashmap, 0.35f);
BH_HashmapSetFactor(hashmap, 0.35f);
/* Check hashmap contents */
iter = bh_hashmap_iter_next(hashmap, NULL);
iter = BH_HashmapIterNext(hashmap, NULL);
BH_VERIFY(iter != NULL);
BH_VERIFY(BH_PTR2INT(bh_hashmap_iter_key(iter)) == 1337);
BH_VERIFY(BH_PTR2INT(bh_hashmap_iter_value(iter)) == 80085);
BH_VERIFY(bh_hashmap_iter_next(hashmap, iter) == NULL);
BH_VERIFY(bh_hashmap_reserve(hashmap, 8192) == 0);
BH_VERIFY(bh_hashmap_empty(hashmap) == 0);
BH_VERIFY(bh_hashmap_size(hashmap) == 1);
BH_VERIFY(bh_hashmap_capacity(hashmap) >= 8192);
BH_VERIFY(bh_hashmap_factor(hashmap) == 0.35f);
BH_VERIFY(BH_PTR2INT(BH_HashmapIterKey(iter)) == 1337);
BH_VERIFY(BH_PTR2INT(BH_HashmapIterValue(iter)) == 80085);
BH_VERIFY(BH_HashmapIterNext(hashmap, iter) == NULL);
BH_VERIFY(BH_HashmapReserve(hashmap, 8192) == 0);
BH_VERIFY(BH_HashmapEmpty(hashmap) == 0);
BH_VERIFY(BH_HashmapSize(hashmap) == 1);
BH_VERIFY(BH_HashmapCapacity(hashmap) >= 8192);
BH_VERIFY_DELTA(BH_HashmapFactor(hashmap), 0.35f, 0.001f);
/* Shrink */
BH_VERIFY(bh_hashmap_reserve(hashmap, 0) == 0);
BH_VERIFY(BH_HashmapReserve(hashmap, 0) == 0);
/* Check hashmap contents */
iter = bh_hashmap_iter_next(hashmap, NULL);
iter = BH_HashmapIterNext(hashmap, NULL);
BH_VERIFY(iter != NULL);
BH_VERIFY(BH_PTR2INT(bh_hashmap_iter_key(iter)) == 1337);
BH_VERIFY(BH_PTR2INT(bh_hashmap_iter_value(iter)) == 80085);
BH_VERIFY(bh_hashmap_iter_next(hashmap, iter) == NULL);
BH_VERIFY(bh_hashmap_empty(hashmap) == 0);
BH_VERIFY(bh_hashmap_size(hashmap) == 1);
BH_VERIFY(bh_hashmap_capacity(hashmap) >= 1);
BH_VERIFY(bh_hashmap_capacity(hashmap) < 8192);
BH_VERIFY(bh_hashmap_factor(hashmap) == 0.35f);
BH_VERIFY(BH_PTR2INT(BH_HashmapIterKey(iter)) == 1337);
BH_VERIFY(BH_PTR2INT(BH_HashmapIterValue(iter)) == 80085);
BH_VERIFY(BH_HashmapIterNext(hashmap, iter) == NULL);
BH_VERIFY(BH_HashmapEmpty(hashmap) == 0);
BH_VERIFY(BH_HashmapSize(hashmap) == 1);
BH_VERIFY(BH_HashmapCapacity(hashmap) >= 1);
BH_VERIFY(BH_HashmapCapacity(hashmap) < 8192);
BH_VERIFY_DELTA(BH_HashmapFactor(hashmap), 0.35f, 0.001f);
/* Shrink to 0 (deallocate) */
bh_hashmap_clear(hashmap);
BH_VERIFY(bh_hashmap_empty(hashmap) != 0);
BH_VERIFY(bh_hashmap_size(hashmap) == 0);
BH_VERIFY(bh_hashmap_capacity(hashmap) > 0);
BH_HashmapClear(hashmap);
BH_VERIFY(BH_HashmapEmpty(hashmap) != 0);
BH_VERIFY(BH_HashmapSize(hashmap) == 0);
BH_VERIFY(BH_HashmapCapacity(hashmap) > 0);
BH_VERIFY(bh_hashmap_reserve(hashmap, 0) == 0);
BH_VERIFY(bh_hashmap_empty(hashmap) != 0);
BH_VERIFY(bh_hashmap_size(hashmap) == 0);
BH_VERIFY(bh_hashmap_capacity(hashmap) == 0);
BH_VERIFY(BH_HashmapReserve(hashmap, 0) == 0);
BH_VERIFY(BH_HashmapEmpty(hashmap) != 0);
BH_VERIFY(BH_HashmapSize(hashmap) == 0);
BH_VERIFY(BH_HashmapCapacity(hashmap) == 0);
/* Check hashmap contents */
iter = bh_hashmap_iter_next(hashmap, NULL);
iter = BH_HashmapIterNext(hashmap, NULL);
BH_VERIFY(iter == NULL);
bh_hashmap_free(hashmap);
BH_HashmapFree(hashmap);
return 0;
}
static int insert_remove(void)
static int InsertRemove(void)
{
bh_hashmap_t *hashmap;
BH_Hashmap *hashmap;
size_t i, added, removed;
void *iter;
hashmap = bh_hashmap_new(direct_equal, direct_hash);
hashmap = BH_HashmapNew(DBG_PtrIntEqual, DBG_PtrIntHash);
BH_VERIFY(hashmap != NULL);
bh_hashmap_set_factor(hashmap, 1.0f);
BH_HashmapSetFactor(hashmap, 1.0f);
/* Insert elements into hashmap */
added = 0;
for (i = 1024; i > 0; i--)
{
added += (i - 1) / 4;
BH_VERIFY(bh_hashmap_insert(hashmap, BH_INT2PTR((i - 1) / 4), BH_INT2PTR(i)) == 0);
BH_VERIFY(BH_HashmapInsert(hashmap, BH_INT2PTR((i - 1) / 4), BH_INT2PTR(i)) == 0);
}
/* Remove elements */
iter = bh_hashmap_iter_next(hashmap, NULL);
iter = BH_HashmapIterNext(hashmap, NULL);
removed = 0;
while (iter)
{
removed += BH_PTR2INT(bh_hashmap_iter_key(iter));
bh_hashmap_iter_remove(hashmap, iter);
removed += BH_PTR2INT(BH_HashmapIterKey(iter));
BH_HashmapIterRemove(hashmap, iter);
iter = bh_hashmap_iter_next(hashmap, NULL);
iter = BH_HashmapIterNext(hashmap, NULL);
}
/* Check inserted elements are equal to removed */
BH_VERIFY(added == removed);
bh_hashmap_free(hashmap);
BH_HashmapFree(hashmap);
return 0;
}
static int lookup(void)
static int Lookup(void)
{
bh_hashmap_t *hashmap;
BH_Hashmap *hashmap;
size_t i;
hashmap = bh_hashmap_new(direct_equal, direct_hash);
hashmap = BH_HashmapNew(DBG_PtrIntEqual, DBG_PtrIntHash);
BH_VERIFY(hashmap != NULL);
/* Insert elements into hashmap */
for (i = 0; i < 256; i++)
BH_VERIFY(bh_hashmap_insert(hashmap, BH_INT2PTR(i * 4), BH_INT2PTR(i)) == 0);
BH_VERIFY(BH_HashmapInsert(hashmap, BH_INT2PTR(i * 4), BH_INT2PTR(i)) == 0);
/* Lookup inserted elements */
for (i = 0; i < 256; i++)
{
void *value;
BH_VERIFY(bh_hashmap_at(hashmap, BH_INT2PTR(i * 4), NULL) == BH_OK);
BH_VERIFY(bh_hashmap_at(hashmap, BH_INT2PTR(i * 4), &value) == BH_OK);
BH_VERIFY(BH_HashmapAt(hashmap, BH_INT2PTR(i * 4), NULL) == BH_OK);
BH_VERIFY(BH_HashmapAt(hashmap, BH_INT2PTR(i * 4), &value) == BH_OK);
BH_VERIFY(BH_PTR2INT(value) == (int)i);
}
@@ -165,55 +165,55 @@ static int lookup(void)
{
void *value;
BH_VERIFY(bh_hashmap_at(hashmap, BH_INT2PTR(i * 4), NULL) != BH_OK);
BH_VERIFY(bh_hashmap_at(hashmap, BH_INT2PTR(i * 4), &value) != BH_OK);
BH_VERIFY(BH_HashmapAt(hashmap, BH_INT2PTR(i * 4), NULL) != BH_OK);
BH_VERIFY(BH_HashmapAt(hashmap, BH_INT2PTR(i * 4), &value) != BH_OK);
}
bh_hashmap_free(hashmap);
BH_HashmapFree(hashmap);
return 0;
}
static int clear(void)
static int Clear(void)
{
bh_hashmap_t *hashmap;
BH_Hashmap *hashmap;
size_t i;
hashmap = bh_hashmap_new(direct_equal, direct_hash);
hashmap = BH_HashmapNew(DBG_PtrIntEqual, DBG_PtrIntHash);
BH_VERIFY(hashmap != NULL);
/* Insert elements into hashmap */
for (i = 0; i < 128; i++)
BH_VERIFY(bh_hashmap_insert(hashmap, BH_INT2PTR(i), 0) == 0);
BH_VERIFY(BH_HashmapInsert(hashmap, BH_INT2PTR(i), 0) == 0);
bh_hashmap_clear(hashmap);
BH_HashmapClear(hashmap);
/* Remove non-existing elements */
for (i = 0; i < 128; i++)
bh_hashmap_remove(hashmap, BH_INT2PTR(i));
BH_HashmapRemove(hashmap, BH_INT2PTR(i));
bh_hashmap_free(hashmap);
BH_HashmapFree(hashmap);
return 0;
}
static int fields(void)
static int Fields(void)
{
bh_hashmap_t *hashmap;
BH_Hashmap *hashmap;
size_t i;
hashmap = bh_hashmap_new(direct_equal, direct_hash);
hashmap = BH_HashmapNew(DBG_PtrIntEqual, DBG_PtrIntHash);
BH_VERIFY(hashmap != NULL);
BH_VERIFY(bh_hashmap_empty(hashmap) == 1);
BH_VERIFY(BH_HashmapEmpty(hashmap) == 1);
/* Insert elements into hashmap */
for (i = 0; i < 14; i++)
BH_VERIFY(bh_hashmap_insert(hashmap, BH_INT2PTR(i), NULL) == 0);
BH_VERIFY(BH_HashmapInsert(hashmap, BH_INT2PTR(i), NULL) == 0);
/* Check hashmap fields correspond to getter functions */
BH_VERIFY(bh_hashmap_size(hashmap) == 14);
BH_VERIFY(bh_hashmap_capacity(hashmap) >= 14);
BH_VERIFY(bh_hashmap_empty(hashmap) == 0);
BH_VERIFY(BH_HashmapSize(hashmap) == 14);
BH_VERIFY(BH_HashmapCapacity(hashmap) >= 14);
BH_VERIFY(BH_HashmapEmpty(hashmap) == 0);
bh_hashmap_free(hashmap);
BH_HashmapFree(hashmap);
return 0;
}
@@ -223,12 +223,12 @@ int main(int argc, char **argv)
(void)argv;
/* Add unit tests */
bh_unit_add("new_free", new_free);
bh_unit_add("grow_shrink", grow_shrink);
bh_unit_add("insert_remove", insert_remove);
bh_unit_add("lookup", lookup);
bh_unit_add("clear", clear);
bh_unit_add("fields", fields);
BH_UnitAdd("NewFree", NewFree);
BH_UnitAdd("GrowShrink", GrowShrink);
BH_UnitAdd("InsertRemove", InsertRemove);
BH_UnitAdd("Lookup", Lookup);
BH_UnitAdd("Clear", Clear);
BH_UnitAdd("Fields", Fields);
return bh_unit_run();
return BH_UnitRun();
}