basic hastable working, though stress testing breaks
This commit is contained in:
parent
6a9f914ffb
commit
c175278416
4 changed files with 114 additions and 57 deletions
|
|
@ -9,30 +9,28 @@
|
|||
|
||||
//TODO: add hash function for testing
|
||||
|
||||
void TEST_Hashtable_PrintKeyVal(void *key, void *value, uint32_t temp, uint32_t tempid){
|
||||
printf("%2d) %2d: %s\t%d\n", temp, tempid, (char *) key, *(int32_t *)value);
|
||||
void TEST_Hashtable_PrintIter(void *key, void *value){
|
||||
printf("%s, %d\n", (char *)key, *(int32_t *)value);
|
||||
}
|
||||
|
||||
void TEST_Hashtable_Print(ARC_Hashtable *hashtable){
|
||||
printf("Hashtable: \n");
|
||||
ARC_Hashtable_RunIteration(hashtable, TEST_Hashtable_PrintKeyVal);
|
||||
printf("\n");
|
||||
void TEST_Hashtable_Print(void *hashtable){
|
||||
ARC_Hashtable_RunIteration(hashtable, TEST_Hashtable_PrintIter);
|
||||
}
|
||||
|
||||
ARC_Bool TEST_Hashtable_KeyCompareDataFn(void *dataA, void *dataB){
|
||||
printf("%s, %s\n", (char *)dataA, (char *)dataB);
|
||||
return (ARC_Bool)strcmp((const char *)dataA, (const char *)dataB) == 0;
|
||||
}
|
||||
|
||||
//TODO: more tests with destroy data fn added
|
||||
void TEST_Hashtable_DestroyKeyValueFn(void *key, void *value){
|
||||
return;
|
||||
free((char *)key);
|
||||
free((int32_t *)value);
|
||||
}
|
||||
|
||||
ARC_TEST(Hashtable_Init){
|
||||
ARC_Hashtable *hashtable;
|
||||
ARC_Hashtable_KeyCompareFn keyCompareFn = TEST_Hashtable_KeyCompareDataFn;
|
||||
ARC_Hashtable_DestroyKeyValueFn destroyKeyValueFn = TEST_Hashtable_DestroyKeyValueFn;
|
||||
ARC_Hashtable_Create(&hashtable, NULL, &keyCompareFn, &destroyKeyValueFn);
|
||||
ARC_Hashtable_Create(&hashtable, NULL, &keyCompareFn, NULL);
|
||||
|
||||
ARC_CHECK(arc_errno == 0);
|
||||
|
||||
|
|
@ -42,8 +40,7 @@ ARC_TEST(Hashtable_Init){
|
|||
ARC_TEST(Hashtable_Add_Get_Remove){
|
||||
ARC_Hashtable *hashtable;
|
||||
ARC_Hashtable_KeyCompareFn keyCompareFn = TEST_Hashtable_KeyCompareDataFn;
|
||||
ARC_Hashtable_DestroyKeyValueFn destroyKeyValueFn = TEST_Hashtable_DestroyKeyValueFn;
|
||||
ARC_Hashtable_Create(&hashtable, NULL, &keyCompareFn, &destroyKeyValueFn);
|
||||
ARC_Hashtable_Create(&hashtable, NULL, &keyCompareFn, NULL);
|
||||
|
||||
char *key0 = (char *)"key0";
|
||||
char *key1 = (char *)"key1";
|
||||
|
|
@ -96,22 +93,85 @@ ARC_TEST(Hashtable_Add_Get_Remove){
|
|||
ARC_CHECK(5 == *(int32_t *)ARC_Hashtable_Get(hashtable, (void *)"key7"));
|
||||
ARC_CHECK(6 == *(int32_t *)ARC_Hashtable_Get(hashtable, (void *)"key8"));
|
||||
|
||||
TEST_Hashtable_Print(hashtable);
|
||||
ARC_Hashtable_Remove(hashtable, (void *)"key0");
|
||||
TEST_Hashtable_Print(hashtable);
|
||||
ARC_Hashtable_Remove(hashtable, (void *)"key4");
|
||||
TEST_Hashtable_Print(hashtable);
|
||||
ARC_Hashtable_Remove(hashtable, (void *)"key3");
|
||||
TEST_Hashtable_Print(hashtable);
|
||||
ARC_Hashtable_Remove(hashtable, (void *)"key8");
|
||||
TEST_Hashtable_Print(hashtable);
|
||||
ARC_Hashtable_Remove(hashtable, (void *)"key6");
|
||||
TEST_Hashtable_Print(hashtable);
|
||||
ARC_Hashtable_Remove(hashtable, (void *)"key7");
|
||||
TEST_Hashtable_Print(hashtable);
|
||||
|
||||
ARC_CHECK(7 != *(int32_t *)ARC_Hashtable_Get(hashtable, (void *)"key1"));
|
||||
ARC_CHECK(1 != *(int32_t *)ARC_Hashtable_Get(hashtable, (void *)"key5"));
|
||||
ARC_CHECK(7 == *(int32_t *)ARC_Hashtable_Get(hashtable, (void *)"key1"));
|
||||
ARC_CHECK(1 == *(int32_t *)ARC_Hashtable_Get(hashtable, (void *)"key5"));
|
||||
|
||||
ARC_Hashtable_Destroy(hashtable);
|
||||
}
|
||||
|
||||
ARC_TEST(Hashtable_Add_Get_100){
|
||||
ARC_Hashtable *hashtable;
|
||||
ARC_Hashtable_KeyCompareFn keyCompareFn = TEST_Hashtable_KeyCompareDataFn;
|
||||
ARC_Hashtable_DestroyKeyValueFn destroyKeyValueFn = TEST_Hashtable_DestroyKeyValueFn;
|
||||
ARC_Hashtable_Create(&hashtable, NULL, &keyCompareFn, &destroyKeyValueFn);
|
||||
|
||||
const char *keyCStr = "key%03u";
|
||||
|
||||
for(uint32_t index = 0; index < 100; index++){
|
||||
char *key = (char *)malloc(strlen(keyCStr));
|
||||
sprintf(key, keyCStr, index);
|
||||
|
||||
int32_t *val = (int32_t *)malloc(sizeof(int32_t));
|
||||
*val = index;
|
||||
|
||||
ARC_Hashtable_Add(hashtable, key, val);
|
||||
}
|
||||
|
||||
for(uint32_t index = 0; index < 100; index++){
|
||||
char *key = (char *)malloc(strlen(keyCStr));
|
||||
sprintf(key, keyCStr, index);
|
||||
|
||||
ARC_CHECK(index == *(int32_t *)ARC_Hashtable_Get(hashtable, key));
|
||||
|
||||
free(key);
|
||||
}
|
||||
|
||||
ARC_Hashtable_Destroy(hashtable);
|
||||
}
|
||||
|
||||
//ARC_TEST(Hashtable_Add_Get_Remove_100){
|
||||
// ARC_Hashtable *hashtable;
|
||||
// ARC_Hashtable_KeyCompareFn keyCompareFn = TEST_Hashtable_KeyCompareDataFn;
|
||||
// ARC_Hashtable_DestroyKeyValueFn destroyKeyValueFn = TEST_Hashtable_DestroyKeyValueFn;
|
||||
// ARC_Hashtable_Create(&hashtable, NULL, &keyCompareFn, &destroyKeyValueFn);
|
||||
//
|
||||
// const char *keyCStr = "key%03u";
|
||||
//
|
||||
// for(uint32_t index = 0; index < 100; index++){
|
||||
// char *key = (char *)malloc(strlen(keyCStr));
|
||||
// sprintf(key, keyCStr, index);
|
||||
//
|
||||
// int32_t *val = (int32_t *)malloc(sizeof(int32_t));
|
||||
// *val = index;
|
||||
//
|
||||
// ARC_Hashtable_Add(hashtable, key, val);
|
||||
// }
|
||||
//
|
||||
// for(uint32_t index = 0; index < 100; index++){
|
||||
// char *key = (char *)malloc(strlen(keyCStr));
|
||||
// sprintf(key, keyCStr, index);
|
||||
//
|
||||
// ARC_CHECK(index == *(int32_t *)ARC_Hashtable_Get(hashtable, key));
|
||||
//
|
||||
// free(key);
|
||||
// }
|
||||
//
|
||||
// for(uint32_t index = 0; index < 100; index++){
|
||||
// char *key = (char *)malloc(strlen(keyCStr));
|
||||
// sprintf(key, keyCStr, index);
|
||||
//
|
||||
// TEST_Hashtable_Print(hashtable);
|
||||
// ARC_Hashtable_Remove(hashtable, key);
|
||||
//
|
||||
// free(key);
|
||||
// }
|
||||
//
|
||||
// ARC_Hashtable_Destroy(hashtable);
|
||||
//}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue