Initial drop of the cachelines-based hashtable implementation

src/hashtable/hashtable.h

@@ -23,8 +23,6 @@ extern "C" {
 #define HASHTABLE_INLINE_KEY_MAX_SIZE                       23
 #define HASHTABLE_PRIMENUMBERS_COUNT                        38
 #define HASHTABLE_PRIMENUMBERS_MAX                          4294967291U
-#define HASHTABLE_CONFIG_CACHELINES_TO_PROBE_COUNT          HASHTABLE_PRIMENUMBERS_COUNT
-#define HASHTABLE_CONFIG_CACHELINES_PRIMENUMBERS_MAP_SIZE  12
 
 #define HASHTABLE_PRIMENUMBERS_LIST \
     42U, /* not a prime number, but it's the answer! */ \
@@ -66,19 +64,6 @@ extern "C" {
     3429704039U, \
     4294967291U
 
-#define HASHTABLE_CONFIG_CACHELINES_PRIMENUMBERS_MAP \
-    { 42U, 2U }, \
-    { 3389U, 4U }, \
-    { 7639U, 6U }, \
-    { 17203U, 7U }, \
-    { 26813U, 8U }, \
-    { 40213U, 9U }, \
-    { 458377U, 10U }, \
-    { 2320651U, 12U }, \
-    { 17622551U, 16U }, \
-    { 89214403U, 17U }, \
-    { 133821599U, 18U }, \
-    { HASHTABLE_PRIMENUMBERS_MAX, 32U }
 
 typedef uint8_t hashtable_bucket_key_value_flags_t;
 typedef uint32_t hashtable_bucket_hash_t;
@@ -110,22 +95,12 @@ enum {
 #define HASHTABLE_BUCKET_KEY_VALUE_IS_EMPTY(flags) \
     (flags == 0)
 
-/**
- * Configuration of the map between the hashtable size and the cachelines to probe when searching / assigning hashes
- */
-struct hashtable_config_cachelines_to_probe {
-    hashtable_bucket_count_t hashtable_size;
-    uint16_t cachelines_to_probe;
-};
-typedef struct hashtable_config_cachelines_to_probe hashtable_config_cachelines_to_probe_t;
-
 /**
  * Configuration of the hashtable
  */
 struct hashtable_config {
     uint64_t initial_size;
     bool can_auto_resize;
-    hashtable_config_cachelines_to_probe_t cachelines_to_probe[HASHTABLE_CONFIG_CACHELINES_TO_PROBE_COUNT];
 };
 typedef struct hashtable_config hashtable_config_t;
 
@@ -158,7 +133,6 @@ typedef struct hashtable_bucket_key_value hashtable_bucket_key_value_t;
 struct hashtable_data {
     hashtable_bucket_count_t buckets_count;
     hashtable_bucket_count_t buckets_count_real;
-    uint16_t cachelines_to_probe;
     uint64_t t1ha2_seed;
     bool can_be_deleted;
     size_t hashes_size;

src/hashtable/hashtable_data.c

@@ -13,18 +13,6 @@
 
 static const char* TAG = "hashtable/data";
 
-uint16_t hashtable_data_cachelines_to_probe_from_buckets_count(
-        hashtable_config_t* hashtable_config,
-        hashtable_bucket_count_t buckets_count) {
-    hashtable_config_cachelines_to_probe_t* list = hashtable_config->cachelines_to_probe;
-    for(uint64_t index = 0; index < HASHTABLE_CONFIG_CACHELINES_TO_PROBE_COUNT; index++) {
-        if (list[index].hashtable_size == buckets_count) {
-            return list[index].cachelines_to_probe;
-        }
-    }
-
-    return 0;
-}
 
 hashtable_data_t* hashtable_data_init(hashtable_bucket_count_t buckets_count, uint16_t cachelines_to_probe) {
     hashtable_bucket_count_t buckets_count_real = 0;

src/hashtable/hashtable_data.h

@@ -5,16 +5,14 @@
 extern "C" {
 #endif
 
-uint16_t hashtable_data_cachelines_to_probe_from_buckets_count(
-        hashtable_config_t* hashtable_config,
+hashtable_data_t* hashtable_data_init(
         hashtable_bucket_count_t buckets_count);
 
-hashtable_data_t* hashtable_data_init(
-        hashtable_bucket_count_t buckets_count,
-        uint16_t cachelines_to_probe);
+void hashtable_data_free_buckets(
+        hashtable_data_t* hashtable_data);
 
 void hashtable_data_free(
-        volatile hashtable_data_t* hashtable_data);
+        hashtable_data_t* hashtable_data);
 
 #ifdef __cplusplus
 }

src/hashtable/hashtable_support_index.c

@@ -7,43 +7,8 @@
 #include "hashtable_support_index.h"
 #include "hashtable_support_primenumbers.h"
 
-
-uint64_t hashtable_support_index_rounddown_to_cacheline(uint64_t number) {
-    return number -
-           (number % HASHTABLE_HASHES_PER_CACHELINE);
-}
-
-uint64_t hashtable_support_index_roundup_to_cacheline_to_probe(uint64_t number, uint16_t cachelines_to_probe) {
-    return
-            hashtable_support_index_rounddown_to_cacheline(number) +
-            (HASHTABLE_HASHES_PER_CACHELINE * cachelines_to_probe);
-}
-
 hashtable_bucket_index_t hashtable_support_index_from_hash(
         hashtable_bucket_count_t buckets_count,
         hashtable_bucket_hash_t hash) {
     return hashtable_support_primenumbers_mod(hash, buckets_count);
 }
-
-void hashtable_support_index_calculate_neighborhood_from_index(
-        hashtable_bucket_index_t index,
-        uint16_t cachelines_to_probe,
-        hashtable_bucket_index_t *index_neighborhood_begin,
-        hashtable_bucket_index_t *index_neighborhood_end) {
-    *index_neighborhood_begin = hashtable_support_index_rounddown_to_cacheline(index);
-    *index_neighborhood_end = hashtable_support_index_roundup_to_cacheline_to_probe(index, cachelines_to_probe) - 1;
-}
-
-void hashtable_support_index_calculate_neighborhood_from_hash(
-        hashtable_bucket_count_t buckets_count,
-        hashtable_bucket_hash_t hash,
-        uint16_t cachelines_to_probe,
-        hashtable_bucket_index_t *index_neighborhood_begin,
-        hashtable_bucket_index_t *index_neighborhood_end) {
-    uint64_t index = hashtable_support_index_from_hash(buckets_count, hash);
-    hashtable_support_index_calculate_neighborhood_from_index(
-            index,
-            cachelines_to_probe,
-            index_neighborhood_begin,
-            index_neighborhood_end);
-}

src/hashtable/hashtable_support_index.h

@@ -5,33 +5,10 @@
 extern "C" {
 #endif
 
-#define HASHTABLE_HASHES_PER_CACHELINE      (int)(HASHTABLE_CACHELINE_LENGTH / HASHTABLE_HASH_SIZE)
-#define HASHTABLE_CACHELINE_LENGTH          64
-#define HASHTABLE_HASH_SIZE                 sizeof(hashtable_bucket_hash_t)
-
-uint64_t hashtable_support_index_rounddown_to_cacheline(uint64_t number);
-
-uint64_t hashtable_support_index_roundup_to_cacheline_to_probe(
-        uint64_t number,
-        uint16_t cachelines_to_probe);
-
 hashtable_bucket_index_t hashtable_support_index_from_hash(
         hashtable_bucket_count_t buckets_count,
         hashtable_bucket_hash_t hash);
 
-void hashtable_support_index_calculate_neighborhood_from_index(
-        hashtable_bucket_index_t index,
-        uint16_t cachelines_to_probe,
-        hashtable_bucket_index_t *index_neighborhood_begin,
-        hashtable_bucket_index_t *index_neighborhood_end);
-
-void hashtable_support_index_calculate_neighborhood_from_hash(
-        hashtable_bucket_count_t buckets_count,
-        hashtable_bucket_hash_t hash,
-        uint16_t cachelines_to_probe,
-        hashtable_bucket_index_t *index_neighborhood_begin,
-        hashtable_bucket_index_t *index_neighborhood_end);
-
 #ifdef __cplusplus
 }
 #endif