Change code and naming style, fix several bugs, removed math types.
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:
@@ -2,156 +2,156 @@
|
||||
#include <bh/unit.h>
|
||||
|
||||
|
||||
static int new_free(void)
|
||||
static int NewFree(void)
|
||||
{
|
||||
bh_queue_t *queue;
|
||||
BH_Queue *queue;
|
||||
|
||||
queue = bh_queue_new();
|
||||
queue = BH_QueueNew();
|
||||
BH_VERIFY(queue != NULL);
|
||||
BH_VERIFY(bh_queue_size(queue) == 0);
|
||||
BH_VERIFY(bh_queue_capacity(queue) == 0);
|
||||
BH_VERIFY(bh_queue_empty(queue) != 0);
|
||||
BH_VERIFY(BH_QueueSize(queue) == 0);
|
||||
BH_VERIFY(BH_QueueCapacity(queue) == 0);
|
||||
BH_VERIFY(BH_QueueEmpty(queue) != 0);
|
||||
|
||||
bh_queue_free(queue);
|
||||
BH_QueueFree(queue);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int grow_shrink(void)
|
||||
static int GrowShrink(void)
|
||||
{
|
||||
bh_queue_t *queue;
|
||||
BH_Queue *queue;
|
||||
void *value;
|
||||
|
||||
queue = bh_queue_new();
|
||||
queue = BH_QueueNew();
|
||||
BH_VERIFY(queue != NULL);
|
||||
|
||||
/* Reserve 1024 elements and insert item into queue */
|
||||
BH_VERIFY(bh_queue_reserve(queue, 1024) == BH_OK);
|
||||
BH_VERIFY(bh_queue_insert(queue, BH_INT2PTR(1337)) == BH_OK);
|
||||
BH_VERIFY(bh_queue_capacity(queue) >= 1024);
|
||||
BH_VERIFY(bh_queue_size(queue) == 1);
|
||||
BH_VERIFY(bh_queue_empty(queue) == 0);
|
||||
BH_VERIFY(BH_QueueReserve(queue, 1024) == BH_OK);
|
||||
BH_VERIFY(BH_QueueInsert(queue, BH_INT2PTR(1337)) == BH_OK);
|
||||
BH_VERIFY(BH_QueueCapacity(queue) >= 1024);
|
||||
BH_VERIFY(BH_QueueSize(queue) == 1);
|
||||
BH_VERIFY(BH_QueueEmpty(queue) == 0);
|
||||
|
||||
/* Check queue content */
|
||||
BH_VERIFY(bh_queue_front(queue, &value) == BH_OK);
|
||||
BH_VERIFY(BH_QueueFront(queue, &value) == BH_OK);
|
||||
BH_VERIFY(BH_PTR2INT(value) == 1337);
|
||||
|
||||
/* Grow queue */
|
||||
BH_VERIFY(bh_queue_reserve(queue, 8192) == BH_OK);
|
||||
BH_VERIFY(bh_queue_capacity(queue) >= 8192);
|
||||
BH_VERIFY(bh_queue_size(queue) == 1);
|
||||
BH_VERIFY(bh_queue_empty(queue) == 0);
|
||||
BH_VERIFY(BH_QueueReserve(queue, 8192) == BH_OK);
|
||||
BH_VERIFY(BH_QueueCapacity(queue) >= 8192);
|
||||
BH_VERIFY(BH_QueueSize(queue) == 1);
|
||||
BH_VERIFY(BH_QueueEmpty(queue) == 0);
|
||||
|
||||
/* Check queue content */
|
||||
BH_VERIFY(bh_queue_front(queue, &value) == BH_OK);
|
||||
BH_VERIFY(BH_QueueFront(queue, &value) == BH_OK);
|
||||
BH_VERIFY(BH_PTR2INT(value) == 1337);
|
||||
|
||||
/* Shrink the queue */
|
||||
BH_VERIFY(bh_queue_reserve(queue, 0) == BH_OK);
|
||||
BH_VERIFY(bh_queue_capacity(queue) >= 1);
|
||||
BH_VERIFY(bh_queue_capacity(queue) < 8192);
|
||||
BH_VERIFY(bh_queue_size(queue) == 1);
|
||||
BH_VERIFY(bh_queue_empty(queue) == 0);
|
||||
BH_VERIFY(BH_QueueReserve(queue, 0) == BH_OK);
|
||||
BH_VERIFY(BH_QueueCapacity(queue) >= 1);
|
||||
BH_VERIFY(BH_QueueCapacity(queue) < 8192);
|
||||
BH_VERIFY(BH_QueueSize(queue) == 1);
|
||||
BH_VERIFY(BH_QueueEmpty(queue) == 0);
|
||||
|
||||
/* Check queue content */
|
||||
BH_VERIFY(bh_queue_front(queue, &value) == BH_OK);
|
||||
BH_VERIFY(BH_QueueFront(queue, &value) == BH_OK);
|
||||
BH_VERIFY(BH_PTR2INT(value) == 1337);
|
||||
|
||||
/* Shrink to 0 (deallocate) */
|
||||
bh_queue_clear(queue);
|
||||
BH_VERIFY(bh_queue_size(queue) == 0);
|
||||
BH_VERIFY(bh_queue_empty(queue) != 0);
|
||||
BH_VERIFY(bh_queue_capacity(queue) >= 1);
|
||||
BH_QueueClear(queue);
|
||||
BH_VERIFY(BH_QueueSize(queue) == 0);
|
||||
BH_VERIFY(BH_QueueEmpty(queue) != 0);
|
||||
BH_VERIFY(BH_QueueCapacity(queue) >= 1);
|
||||
|
||||
BH_VERIFY(bh_queue_reserve(queue, 0) == BH_OK);
|
||||
BH_VERIFY(bh_queue_size(queue) == 0);
|
||||
BH_VERIFY(bh_queue_empty(queue) != 0);
|
||||
BH_VERIFY(bh_queue_capacity(queue) == 0);
|
||||
BH_VERIFY(BH_QueueReserve(queue, 0) == BH_OK);
|
||||
BH_VERIFY(BH_QueueSize(queue) == 0);
|
||||
BH_VERIFY(BH_QueueEmpty(queue) != 0);
|
||||
BH_VERIFY(BH_QueueCapacity(queue) == 0);
|
||||
|
||||
bh_queue_free(queue);
|
||||
BH_QueueFree(queue);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int insert_remove(void)
|
||||
static int InsertRemove(void)
|
||||
{
|
||||
bh_queue_t *queue;
|
||||
BH_Queue *queue;
|
||||
size_t i, added, removed;
|
||||
void *iter;
|
||||
|
||||
queue = bh_queue_new();
|
||||
queue = BH_QueueNew();
|
||||
BH_VERIFY(queue != NULL);
|
||||
|
||||
added = 0;
|
||||
for (i = 0; i < 256; i++)
|
||||
{
|
||||
added += i * 2;
|
||||
BH_VERIFY(bh_queue_insert(queue, BH_INT2PTR(i * 2)) == BH_OK);
|
||||
BH_VERIFY(BH_QueueInsert(queue, BH_INT2PTR(i * 2)) == BH_OK);
|
||||
}
|
||||
|
||||
removed = 0;
|
||||
iter = bh_queue_iter_next(queue, NULL);
|
||||
iter = BH_QueueIterNext(queue, NULL);
|
||||
while (iter)
|
||||
{
|
||||
void *value;
|
||||
|
||||
BH_VERIFY(bh_queue_front(queue, &value) == BH_OK);
|
||||
BH_VERIFY(BH_QueueFront(queue, &value) == BH_OK);
|
||||
removed += BH_PTR2INT(value);
|
||||
|
||||
bh_queue_remove(queue);
|
||||
iter = bh_queue_iter_next(queue, NULL);
|
||||
BH_QueueRemove(queue);
|
||||
iter = BH_QueueIterNext(queue, NULL);
|
||||
}
|
||||
|
||||
BH_VERIFY(added == removed);
|
||||
BH_VERIFY(bh_queue_empty(queue) != 0);
|
||||
BH_VERIFY(bh_queue_size(queue) == 0);
|
||||
BH_VERIFY(BH_QueueEmpty(queue) != 0);
|
||||
BH_VERIFY(BH_QueueSize(queue) == 0);
|
||||
|
||||
bh_queue_free(queue);
|
||||
BH_QueueFree(queue);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int rollover(void)
|
||||
static int Rollover(void)
|
||||
{
|
||||
bh_queue_t *queue;
|
||||
BH_Queue *queue;
|
||||
size_t i, j, capacity;
|
||||
|
||||
queue = bh_queue_new();
|
||||
queue = BH_QueueNew();
|
||||
BH_VERIFY(queue != NULL);
|
||||
|
||||
BH_VERIFY(bh_queue_reserve(queue, 128) == 0);
|
||||
capacity = bh_queue_capacity(queue);
|
||||
BH_VERIFY(BH_QueueReserve(queue, 128) == 0);
|
||||
capacity = BH_QueueCapacity(queue);
|
||||
|
||||
for (i = 0; i < 128; i++)
|
||||
{
|
||||
for (j = 0; j < 3; j++)
|
||||
bh_queue_remove(queue);
|
||||
BH_QueueRemove(queue);
|
||||
|
||||
for (j = 0; j < 4 && bh_queue_size(queue) < 128; j++)
|
||||
BH_VERIFY(bh_queue_insert(queue, BH_INT2PTR(i * 4 + j)) == 0);
|
||||
for (j = 0; j < 4 && BH_QueueSize(queue) < 128; j++)
|
||||
BH_VERIFY(BH_QueueInsert(queue, BH_INT2PTR(i * 4 + j)) == 0);
|
||||
}
|
||||
|
||||
BH_VERIFY(bh_queue_size(queue) == 128);
|
||||
BH_VERIFY(bh_queue_capacity(queue) == capacity);
|
||||
BH_VERIFY(BH_QueueSize(queue) == 128);
|
||||
BH_VERIFY(BH_QueueCapacity(queue) == capacity);
|
||||
|
||||
bh_queue_free(queue);
|
||||
BH_QueueFree(queue);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int fields(void)
|
||||
static int Fields(void)
|
||||
{
|
||||
bh_queue_t *queue;
|
||||
BH_Queue *queue;
|
||||
|
||||
queue = bh_queue_new();
|
||||
queue = BH_QueueNew();
|
||||
BH_VERIFY(queue != NULL);
|
||||
|
||||
BH_VERIFY(bh_queue_insert(queue, BH_INT2PTR(1337)) == 0);
|
||||
BH_VERIFY(bh_queue_size(queue) == 1);
|
||||
BH_VERIFY(bh_queue_empty(queue) == 0);
|
||||
BH_VERIFY(bh_queue_capacity(queue) >= 1);
|
||||
BH_VERIFY(BH_QueueInsert(queue, BH_INT2PTR(1337)) == 0);
|
||||
BH_VERIFY(BH_QueueSize(queue) == 1);
|
||||
BH_VERIFY(BH_QueueEmpty(queue) == 0);
|
||||
BH_VERIFY(BH_QueueCapacity(queue) >= 1);
|
||||
|
||||
bh_queue_free(queue);
|
||||
BH_QueueFree(queue);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -161,11 +161,11 @@ int main(int argc, char **argv)
|
||||
(void)argc;
|
||||
(void)argv;
|
||||
|
||||
bh_unit_add("new_free", new_free);
|
||||
bh_unit_add("grow_shrink", grow_shrink);
|
||||
bh_unit_add("insert_remove", insert_remove);
|
||||
bh_unit_add("rollover", rollover);
|
||||
bh_unit_add("fields", fields);
|
||||
BH_UnitAdd("NewFree", NewFree);
|
||||
BH_UnitAdd("GrowShrink", GrowShrink);
|
||||
BH_UnitAdd("InsertRemove", InsertRemove);
|
||||
BH_UnitAdd("Rollover", Rollover);
|
||||
BH_UnitAdd("Fields", Fields);
|
||||
|
||||
return bh_unit_run();
|
||||
return BH_UnitRun();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user