stephenseo/UDPConnection
1
0
Fork 0
Code Issues Pull requests Actions Projects Releases Wiki Activity

Revert "Change formatting in HashMap.c"

Browse source 
This reverts commit 1dba20ba0d.
This commit is contained in:
Stephen Seo 2019-02-12 17:39:07 +09:00
parent 1dba20ba0d
commit 6801cc9744
1 changed files with 86 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
src/UDPC_HashMap.c
View file

@ -6,7 +6,10 @@
UDPC_HashMap* UDPC_HashMap_init(uint32_t capacity, uint32_t unitSize)
{
UDPC_HashMap *m = malloc(sizeof(UDPC_HashMap));
if(!m) { return NULL; }
if(!m)
{
return NULL;
}
int fail = 0;
m->size = 0;
@ -28,14 +31,20 @@ UDPC_HashMap* UDPC_HashMap_init(uint32_t capacity, uint32_t unitSize)
continue;
}
m->buckets[x] = UDPC_Deque_init(UDPC_HASHMAP_BUCKET_SIZE * (sizeof(uint32_t) + unitSize));
if(!m->buckets[x]) { fail = 1; }
if(!m->buckets[x])
{
fail = 1;
}
}
if(fail != 0)
{
for(int x = 0; x < m->capacity; ++x)
{
if(m->buckets[x]) { UDPC_Deque_destroy(m->buckets[x]); }
if(m->buckets[x])
{
UDPC_Deque_destroy(m->buckets[x]);
}
}
free(m->buckets);
free(m);
@ -47,7 +56,10 @@ UDPC_HashMap* UDPC_HashMap_init(uint32_t capacity, uint32_t unitSize)
{
for(int x = 0; x < m->capacity; ++x)
{
if(m->buckets[x]) { UDPC_Deque_destroy(m->buckets[x]); }
if(m->buckets[x])
{
UDPC_Deque_destroy(m->buckets[x]);
}
}
free(m->buckets);
free(m);
@ -72,7 +84,10 @@ void* UDPC_HashMap_insert(UDPC_HashMap *hm, uint32_t key, void *data)
{
if(hm->capacity <= hm->size)
{
if(UDPC_HashMap_realloc(hm, hm->capacity * 2) == 0) { return NULL; }
if(UDPC_HashMap_realloc(hm, hm->capacity * 2) == 0)
{
return NULL;
}
}
UDPC_HashMap_remove(hm, key);
@ -81,7 +96,10 @@ void* UDPC_HashMap_insert(UDPC_HashMap *hm, uint32_t key, void *data)
char *temp = malloc(sizeof(uint32_t) + hm->unitSize);
memcpy(temp, &key, sizeof(uint32_t));
if(hm->unitSize > 0) { memcpy(temp + sizeof(uint32_t), data, hm->unitSize); }
if(hm->unitSize > 0)
{
memcpy(temp + sizeof(uint32_t), data, hm->unitSize);
}
if(UDPC_Deque_get_available(hm->buckets[hash]) != 0)
{
@ -105,7 +123,10 @@ void* UDPC_HashMap_insert(UDPC_HashMap *hm, uint32_t key, void *data)
int UDPC_HashMap_remove(UDPC_HashMap *hm, uint32_t key)
{
if(hm->size == 0) { return 0; }
if(hm->size == 0)
{
return 0;
}
uint32_t hash = UDPC_HASH32(key) % hm->capacity;
@ -117,8 +138,15 @@ int UDPC_HashMap_remove(UDPC_HashMap *hm, uint32_t key)
sizeof(uint32_t)) == 0)
{
int result = UDPC_Deque_remove(hm->buckets[hash], sizeof(uint32_t) + hm->unitSize, x);
if(result != 0) { --hm->size; return 1; }
else { return 0; }
if(result != 0)
{
--hm->size;
return 1;
}
else
{
return 0;
}
}
}
@ -130,8 +158,15 @@ int UDPC_HashMap_remove(UDPC_HashMap *hm, uint32_t key)
sizeof(uint32_t)) == 0)
{
int result = UDPC_Deque_remove(hm->overflow, sizeof(uint32_t) + hm->unitSize, x);
if(result != 0) { --hm->size; return 1; }
else { return 0; }
if(result != 0)
{
--hm->size;
return 1;
}
else
{
return 0;
}
}
}
@ -140,7 +175,10 @@ int UDPC_HashMap_remove(UDPC_HashMap *hm, uint32_t key)
void* UDPC_HashMap_get(UDPC_HashMap *hm, uint32_t key)
{
if(hm->size == 0) { return NULL; }
if(hm->size == 0)
{
return NULL;
}
uint32_t hash = UDPC_HASH32(key) % hm->capacity;
@ -152,8 +190,14 @@ void* UDPC_HashMap_get(UDPC_HashMap *hm, uint32_t key)
&key,
sizeof(uint32_t)) == 0)
{
if(hm->unitSize > 0) { return ptr + sizeof(uint32_t); }
else { return ptr; }
if(hm->unitSize > 0)
{
return ptr + sizeof(uint32_t);
}
else
{
return ptr;
}
}
}
@ -165,8 +209,14 @@ void* UDPC_HashMap_get(UDPC_HashMap *hm, uint32_t key)
&key,
sizeof(uint32_t)) == 0)
{
if(hm->unitSize > 0) { return ptr + sizeof(uint32_t); }
else { return ptr; }
if(hm->unitSize > 0)
{
return ptr + sizeof(uint32_t);
}
else
{
return ptr;
}
}
}
@ -175,7 +225,10 @@ void* UDPC_HashMap_get(UDPC_HashMap *hm, uint32_t key)
int UDPC_HashMap_realloc(UDPC_HashMap *hm, uint32_t newCapacity)
{
if(hm->size > newCapacity) { return 0; }
if(hm->size > newCapacity)
{
return 0;
}
UDPC_Deque **newBuckets = malloc(sizeof(UDPC_Deque*) * newCapacity);
UDPC_Deque *newOverflow = UDPC_Deque_init(UDPC_HASHMAP_BUCKET_SIZE
@ -212,19 +265,28 @@ int UDPC_HashMap_realloc(UDPC_HashMap *hm, uint32_t newCapacity)
}
}
}
if(fail != 0) { break; }
if(fail != 0)
{
break;
}
}
if(fail != 0)
{
for(int x = 0; x < newCapacity; ++x) { UDPC_Deque_destroy(newBuckets[x]); }
for(int x = 0; x < newCapacity; ++x)
{
UDPC_Deque_destroy(newBuckets[x]);
}
free(newBuckets);
UDPC_Deque_destroy(newOverflow);
return 0;
}
else
{
for(int x = 0; x < hm->capacity; ++x) { UDPC_Deque_destroy(hm->buckets[x]); }
for(int x = 0; x < hm->capacity; ++x)
{
UDPC_Deque_destroy(hm->buckets[x]);
}
free(hm->buckets);
UDPC_Deque_destroy(hm->overflow);
@ -238,7 +300,10 @@ int UDPC_HashMap_realloc(UDPC_HashMap *hm, uint32_t newCapacity)
void UDPC_HashMap_clear(UDPC_HashMap *hm)
{
for(int x = 0; x < hm->capacity; ++x) { UDPC_Deque_clear(hm->buckets[x]); }
for(int x = 0; x < hm->capacity; ++x)
{
UDPC_Deque_clear(hm->buckets[x]);
}
UDPC_Deque_clear(hm->overflow);
hm->size = 0;
}