Muldersoft/LibHashSet
Muldersoft/LibHashSet
1
0
Fork 0
Code Releases 4 Activity

Small code clean-up.

Browse Source
This commit is contained in:
LoRd_MuldeR 2022-11-25 02:53:34 +01:00
parent faac252f7f
commit e550528fe8
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hashset/src/main.c
View File

@ -3,7 +3,7 @@
/* This work has been released under the CC0 1.0 Universal license! */ /* This work has been released under the CC0 1.0 Universal license! */
/******************************************************************************/ /******************************************************************************/
#include "hash_set.h" #include <hash_set.h>
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
@ -203,7 +203,7 @@ static int test_function_2(hash_set_t *const hash_set)
memset(test, 0, sizeof(test)); memset(test, 0, sizeof(test));
for (size_t r = 0U, offset = 0U; r < 8U; ++r, offset = 0U) for (size_t r = 0U, offset = 0U; r < 64U; ++r, offset = 0U)
{ {
for (size_t j = 0U; j < ARRSIZE / 3U; ++j) for (size_t j = 0U; j < ARRSIZE / 3U; ++j)
{ {

2
libhashset/include/hash_set.h
View File

@ -9,7 +9,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#ifdef HASHSET_DLL #if defined(_WIN32) && defined(HASHSET_DLL)
# ifdef _HASHSET_EXPORTS # ifdef _HASHSET_EXPORTS
# define HASHSET_API extern __declspec(dllexport) # define HASHSET_API extern __declspec(dllexport)
# else # else

41
libhashset/src/hash_set.c
View File

@ -61,12 +61,6 @@ static const double DEFAULT_LOADFCTR = 0.8;
/* Math */ /* Math */
/* ------------------------------------------------- */ /* ------------------------------------------------- */
static FORCE_INLINE size_t safe_mult(const size_t a, const size_t b)
{
const size_t result = a * b;
return ((a == 0U) || (result / a == b)) ? result : SIZE_MAX;
}
static FORCE_INLINE size_t div_ceil(const size_t value, const size_t divisor) static FORCE_INLINE size_t div_ceil(const size_t value, const size_t divisor)
{ {
return (value / divisor) + ((value % divisor != 0U) ? 1U : 0U); return (value / divisor) + ((value % divisor != 0U) ? 1U : 0U);
@ -93,13 +87,24 @@ static FORCE_INLINE size_t safe_decr(const size_t value)
return (value > 0U) ? (value - 1U) : value; return (value > 0U) ? (value - 1U) : value;
} }
static FORCE_INLINE size_t safe_mult(const size_t a, const size_t b)
{
const size_t result = a * b;
return ((a == 0U) || (result / a == b)) ? result : SIZE_MAX;
}
static FORCE_INLINE size_t safe_times2(const size_t value)
{
return (value <= (SIZE_MAX / 2U)) ? (2U * value) : SIZE_MAX;
}
static FORCE_INLINE size_t next_pow2(const size_t target) static FORCE_INLINE size_t next_pow2(const size_t target)
{ {
size_t result = MINIMUM_CAPACITY; size_t result = MINIMUM_CAPACITY;
while (result < target) while (result < target)
{ {
result = safe_mult(result, 2U); result = safe_times2(result);
} }
return result; return result;
@ -351,12 +356,12 @@ errno_t hash_set_insert(hash_set_t *const instance, const uint64_t value)
if ((!slot_reused) && (safe_add(instance->valid, instance->deleted) >= instance->limit)) if ((!slot_reused) && (safe_add(instance->valid, instance->deleted) >= instance->limit))
{ {
const errno_t error = rebuild_set(instance, safe_mult(instance->data.capacity, 2U)); const errno_t error = rebuild_set(instance, safe_times2(instance->data.capacity));
if (error) if (error)
{ {
return error; return error;
} }
else if (find_slot(&instance->data, value, &index, &slot_reused)) if (find_slot(&instance->data, value, &index, &slot_reused))
{ {
return EFAULT; return EFAULT;
} }
@ -408,8 +413,8 @@ errno_t hash_set_remove(hash_set_t *const instance, const uint64_t value)
if (instance->deleted > (instance->limit / 2U)) if (instance->deleted > (instance->limit / 2U))
{ {
const size_t new_capacity = next_pow2(round_sz(safe_incr(instance->valid) / instance->load_factor)); const size_t min_capacity = next_pow2(round_sz(safe_incr(instance->valid) / instance->load_factor));
const errno_t error = rebuild_set(instance, (instance->data.capacity > new_capacity) ? new_capacity : instance->data.capacity); const errno_t error = rebuild_set(instance, (instance->data.capacity > min_capacity) ? min_capacity : instance->data.capacity);
if (error && (error != ENOMEM)) if (error && (error != ENOMEM))
{ {
return error; return error;
@ -426,16 +431,18 @@ errno_t hash_set_clear(hash_set_t *const instance)
return EINVAL; return EINVAL;
} }
if ((!instance->valid) && (!instance->deleted)) if (instance->valid || instance->deleted)
{
const size_t count = div_ceil(instance->data.capacity, 8U);
instance->valid = instance->deleted = 0U;
zero_memory(instance->data.used, count, sizeof(uint8_t));
zero_memory(instance->data.deleted, count, sizeof(uint8_t));
}
else
{ {
return EAGAIN; return EAGAIN;
} }
instance->valid = instance->deleted = 0U;
zero_memory(instance->data.used, div_ceil(instance->data.capacity, 8U), sizeof(uint8_t));
zero_memory(instance->data.deleted, div_ceil(instance->data.capacity, 8U), sizeof(uint8_t));
if (instance->data.capacity > MINIMUM_CAPACITY) if (instance->data.capacity > MINIMUM_CAPACITY)
{ {
const errno_t error = rebuild_set(instance, MINIMUM_CAPACITY); const errno_t error = rebuild_set(instance, MINIMUM_CAPACITY);