summaryrefslogtreecommitdiffstats
path: root/src/libnetdata/dictionary
diff options
context:
space:
mode:
Diffstat (limited to 'src/libnetdata/dictionary')
-rw-r--r--src/libnetdata/dictionary/dictionary-hashtable.h242
-rw-r--r--src/libnetdata/dictionary/dictionary.c11
-rw-r--r--src/libnetdata/dictionary/dictionary.h6
3 files changed, 133 insertions, 126 deletions
diff --git a/src/libnetdata/dictionary/dictionary-hashtable.h b/src/libnetdata/dictionary/dictionary-hashtable.h
index 865f0b360..14c81cfcc 100644
--- a/src/libnetdata/dictionary/dictionary-hashtable.h
+++ b/src/libnetdata/dictionary/dictionary-hashtable.h
@@ -8,96 +8,96 @@
// ----------------------------------------------------------------------------
// hashtable operations with simple hashtable
-static inline bool compare_keys(void *key1, void *key2) {
- const char *k1 = key1;
- const char *k2 = key2;
- return strcmp(k1, k2) == 0;
-}
-
-static inline void *item_to_key(DICTIONARY_ITEM *item) {
- return (void *)item_get_name(item);
-}
-
-#define SIMPLE_HASHTABLE_VALUE_TYPE DICTIONARY_ITEM
-#define SIMPLE_HASHTABLE_NAME _DICTIONARY
-#define SIMPLE_HASHTABLE_VALUE2KEY_FUNCTION item_to_key
-#define SIMPLE_HASHTABLE_COMPARE_KEYS_FUNCTION compare_keys
-#include "..//simple_hashtable.h"
-
-static inline size_t hashtable_init_hashtable(DICTIONARY *dict) {
- SIMPLE_HASHTABLE_DICTIONARY *ht = callocz(1, sizeof(*ht));
- simple_hashtable_init_DICTIONARY(ht, 4);
- dict->index.JudyHSArray = ht;
- return 0;
-}
-
-static inline size_t hashtable_destroy_hashtable(DICTIONARY *dict) {
- SIMPLE_HASHTABLE_DICTIONARY *ht = dict->index.JudyHSArray;
- if(unlikely(!ht)) return 0;
-
- size_t mem = sizeof(*ht) + ht->size * sizeof(SIMPLE_HASHTABLE_SLOT_DICTIONARY);
- simple_hashtable_destroy_DICTIONARY(ht);
- freez(ht);
- dict->index.JudyHSArray = NULL;
-
- return mem;
-}
-
-static inline void *hashtable_insert_hashtable(DICTIONARY *dict, const char *name, size_t name_len) {
- SIMPLE_HASHTABLE_DICTIONARY *ht = dict->index.JudyHSArray;
-
- char key[name_len+1];
- memcpy(key, name, name_len);
- key[name_len] = '\0';
-
- XXH64_hash_t hash = XXH3_64bits(name, name_len);
- SIMPLE_HASHTABLE_SLOT_DICTIONARY *sl = simple_hashtable_get_slot_DICTIONARY(ht, hash, key, true);
- sl->hash = hash; // we will need it in insert later - it is ok to overwrite - it is the same already
- return sl;
-}
-
-static inline DICTIONARY_ITEM *hashtable_insert_handle_to_item_hashtable(DICTIONARY *dict, void *handle) {
- (void)dict;
- SIMPLE_HASHTABLE_SLOT_DICTIONARY *sl = handle;
- DICTIONARY_ITEM *item = SIMPLE_HASHTABLE_SLOT_DATA(sl);
- return item;
-}
-
-static inline void hashtable_set_item_hashtable(DICTIONARY *dict, void *handle, DICTIONARY_ITEM *item) {
- SIMPLE_HASHTABLE_DICTIONARY *ht = dict->index.JudyHSArray;
- SIMPLE_HASHTABLE_SLOT_DICTIONARY *sl = handle;
- simple_hashtable_set_slot_DICTIONARY(ht, sl, sl->hash, item);
-}
-
-static inline int hashtable_delete_hashtable(DICTIONARY *dict, const char *name, size_t name_len, DICTIONARY_ITEM *item_to_delete) {
- (void)item_to_delete;
- SIMPLE_HASHTABLE_DICTIONARY *ht = dict->index.JudyHSArray;
-
- char key[name_len+1];
- memcpy(key, name, name_len);
- key[name_len] = '\0';
-
- XXH64_hash_t hash = XXH3_64bits(name, name_len);
- SIMPLE_HASHTABLE_SLOT_DICTIONARY *sl = simple_hashtable_get_slot_DICTIONARY(ht, hash, key, false);
- DICTIONARY_ITEM *item = SIMPLE_HASHTABLE_SLOT_DATA(sl);
- if(!item) return 0; // return not-found
-
- simple_hashtable_del_slot_DICTIONARY(ht, sl);
- return 1; // return deleted
-}
-
-static inline DICTIONARY_ITEM *hashtable_get_hashtable(DICTIONARY *dict, const char *name, size_t name_len) {
- SIMPLE_HASHTABLE_DICTIONARY *ht = dict->index.JudyHSArray;
- if(unlikely(!ht)) return NULL;
-
- char key[name_len+1];
- memcpy(key, name, name_len);
- key[name_len] = '\0';
-
- XXH64_hash_t hash = XXH3_64bits(name, name_len);
- SIMPLE_HASHTABLE_SLOT_DICTIONARY *sl = simple_hashtable_get_slot_DICTIONARY(ht, hash, key, true);
- return SIMPLE_HASHTABLE_SLOT_DATA(sl);
-}
+//static inline bool compare_keys(void *key1, void *key2) {
+// const char *k1 = key1;
+// const char *k2 = key2;
+// return strcmp(k1, k2) == 0;
+//}
+//
+//static inline void *item_to_key(DICTIONARY_ITEM *item) {
+// return (void *)item_get_name(item);
+//}
+//
+//#define SIMPLE_HASHTABLE_VALUE_TYPE DICTIONARY_ITEM
+//#define SIMPLE_HASHTABLE_NAME _DICTIONARY
+//#define SIMPLE_HASHTABLE_VALUE2KEY_FUNCTION item_to_key
+//#define SIMPLE_HASHTABLE_COMPARE_KEYS_FUNCTION compare_keys
+//#include "..//simple_hashtable.h"
+
+//static inline size_t hashtable_init_hashtable(DICTIONARY *dict) {
+// SIMPLE_HASHTABLE_DICTIONARY *ht = callocz(1, sizeof(*ht));
+// simple_hashtable_init_DICTIONARY(ht, 4);
+// dict->index.JudyHSArray = ht;
+// return 0;
+//}
+//
+//static inline size_t hashtable_destroy_hashtable(DICTIONARY *dict) {
+// SIMPLE_HASHTABLE_DICTIONARY *ht = dict->index.JudyHSArray;
+// if(unlikely(!ht)) return 0;
+//
+// size_t mem = sizeof(*ht) + ht->size * sizeof(SIMPLE_HASHTABLE_SLOT_DICTIONARY);
+// simple_hashtable_destroy_DICTIONARY(ht);
+// freez(ht);
+// dict->index.JudyHSArray = NULL;
+//
+// return mem;
+//}
+//
+//static inline void *hashtable_insert_hashtable(DICTIONARY *dict, const char *name, size_t name_len) {
+// SIMPLE_HASHTABLE_DICTIONARY *ht = dict->index.JudyHSArray;
+//
+// char key[name_len+1];
+// memcpy(key, name, name_len);
+// key[name_len] = '\0';
+//
+// XXH64_hash_t hash = XXH3_64bits(name, name_len);
+// SIMPLE_HASHTABLE_SLOT_DICTIONARY *sl = simple_hashtable_get_slot_DICTIONARY(ht, hash, key, true);
+// sl->hash = hash; // we will need it in insert later - it is ok to overwrite - it is the same already
+// return sl;
+//}
+//
+//static inline DICTIONARY_ITEM *hashtable_insert_handle_to_item_hashtable(DICTIONARY *dict, void *handle) {
+// (void)dict;
+// SIMPLE_HASHTABLE_SLOT_DICTIONARY *sl = handle;
+// DICTIONARY_ITEM *item = SIMPLE_HASHTABLE_SLOT_DATA(sl);
+// return item;
+//}
+//
+//static inline void hashtable_set_item_hashtable(DICTIONARY *dict, void *handle, DICTIONARY_ITEM *item) {
+// SIMPLE_HASHTABLE_DICTIONARY *ht = dict->index.JudyHSArray;
+// SIMPLE_HASHTABLE_SLOT_DICTIONARY *sl = handle;
+// simple_hashtable_set_slot_DICTIONARY(ht, sl, sl->hash, item);
+//}
+//
+//static inline int hashtable_delete_hashtable(DICTIONARY *dict, const char *name, size_t name_len, DICTIONARY_ITEM *item_to_delete) {
+// (void)item_to_delete;
+// SIMPLE_HASHTABLE_DICTIONARY *ht = dict->index.JudyHSArray;
+//
+// char key[name_len+1];
+// memcpy(key, name, name_len);
+// key[name_len] = '\0';
+//
+// XXH64_hash_t hash = XXH3_64bits(name, name_len);
+// SIMPLE_HASHTABLE_SLOT_DICTIONARY *sl = simple_hashtable_get_slot_DICTIONARY(ht, hash, key, false);
+// DICTIONARY_ITEM *item = SIMPLE_HASHTABLE_SLOT_DATA(sl);
+// if(!item) return 0; // return not-found
+//
+// simple_hashtable_del_slot_DICTIONARY(ht, sl);
+// return 1; // return deleted
+//}
+//
+//static inline DICTIONARY_ITEM *hashtable_get_hashtable(DICTIONARY *dict, const char *name, size_t name_len) {
+// SIMPLE_HASHTABLE_DICTIONARY *ht = dict->index.JudyHSArray;
+// if(unlikely(!ht)) return NULL;
+//
+// char key[name_len+1];
+// memcpy(key, name, name_len);
+// key[name_len] = '\0';
+//
+// XXH64_hash_t hash = XXH3_64bits(name, name_len);
+// SIMPLE_HASHTABLE_SLOT_DICTIONARY *sl = simple_hashtable_get_slot_DICTIONARY(ht, hash, key, true);
+// return SIMPLE_HASHTABLE_SLOT_DATA(sl);
+//}
// ----------------------------------------------------------------------------
// hashtable operations with Judy
@@ -201,40 +201,44 @@ static inline DICTIONARY_ITEM *hashtable_get_judy(DICTIONARY *dict, const char *
// select the right hashtable
static inline size_t hashtable_init_unsafe(DICTIONARY *dict) {
- if(dict->options & DICT_OPTION_INDEX_JUDY)
- return hashtable_init_judy(dict);
- else
- return hashtable_init_hashtable(dict);
+ return hashtable_init_judy(dict);
+// if(dict->options & DICT_OPTION_INDEX_JUDY)
+// return hashtable_init_judy(dict);
+// else
+// return hashtable_init_hashtable(dict);
}
static inline size_t hashtable_destroy_unsafe(DICTIONARY *dict) {
pointer_destroy_index(dict);
- if(dict->options & DICT_OPTION_INDEX_JUDY)
- return hashtable_destroy_judy(dict);
- else
- return hashtable_destroy_hashtable(dict);
+// if(dict->options & DICT_OPTION_INDEX_JUDY)
+ return hashtable_destroy_judy(dict);
+// else
+// return hashtable_destroy_hashtable(dict);
}
static inline void *hashtable_insert_unsafe(DICTIONARY *dict, const char *name, size_t name_len) {
- if(dict->options & DICT_OPTION_INDEX_JUDY)
- return hashtable_insert_judy(dict, name, name_len);
- else
- return hashtable_insert_hashtable(dict, name, name_len);
+ return hashtable_insert_judy(dict, name, name_len);
+// if(dict->options & DICT_OPTION_INDEX_JUDY)
+// return hashtable_insert_judy(dict, name, name_len);
+// else
+// return hashtable_insert_hashtable(dict, name, name_len);
}
static inline DICTIONARY_ITEM *hashtable_insert_handle_to_item_unsafe(DICTIONARY *dict, void *handle) {
- if(dict->options & DICT_OPTION_INDEX_JUDY)
- return hashtable_insert_handle_to_item_judy(dict, handle);
- else
- return hashtable_insert_handle_to_item_hashtable(dict, handle);
+ return hashtable_insert_handle_to_item_judy(dict, handle);
+// if(dict->options & DICT_OPTION_INDEX_JUDY)
+// return hashtable_insert_handle_to_item_judy(dict, handle);
+// else
+// return hashtable_insert_handle_to_item_hashtable(dict, handle);
}
static inline int hashtable_delete_unsafe(DICTIONARY *dict, const char *name, size_t name_len, DICTIONARY_ITEM *item) {
- if(dict->options & DICT_OPTION_INDEX_JUDY)
- return hashtable_delete_judy(dict, name, name_len, item);
- else
- return hashtable_delete_hashtable(dict, name, name_len, item);
+ return hashtable_delete_judy(dict, name, name_len, item);
+// if(dict->options & DICT_OPTION_INDEX_JUDY)
+// return hashtable_delete_judy(dict, name, name_len, item);
+// else
+// return hashtable_delete_hashtable(dict, name, name_len, item);
}
static inline DICTIONARY_ITEM *hashtable_get_unsafe(DICTIONARY *dict, const char *name, size_t name_len) {
@@ -242,10 +246,11 @@ static inline DICTIONARY_ITEM *hashtable_get_unsafe(DICTIONARY *dict, const char
DICTIONARY_ITEM *item;
- if(dict->options & DICT_OPTION_INDEX_JUDY)
- item = hashtable_get_judy(dict, name, name_len);
- else
- item = hashtable_get_hashtable(dict, name, name_len);
+ item = hashtable_get_judy(dict, name, name_len);
+// if(dict->options & DICT_OPTION_INDEX_JUDY)
+// item = hashtable_get_judy(dict, name, name_len);
+// else
+// item = hashtable_get_hashtable(dict, name, name_len);
if(item)
pointer_check(dict, item);
@@ -254,10 +259,11 @@ static inline DICTIONARY_ITEM *hashtable_get_unsafe(DICTIONARY *dict, const char
}
static inline void hashtable_set_item_unsafe(DICTIONARY *dict, void *handle, DICTIONARY_ITEM *item) {
- if(dict->options & DICT_OPTION_INDEX_JUDY)
- hashtable_set_item_judy(dict, handle, item);
- else
- hashtable_set_item_hashtable(dict, handle, item);
+ hashtable_set_item_judy(dict, handle, item);
+// if(dict->options & DICT_OPTION_INDEX_JUDY)
+// hashtable_set_item_judy(dict, handle, item);
+// else
+// hashtable_set_item_hashtable(dict, handle, item);
}
#endif //NETDATA_DICTIONARY_HASHTABLE_H
diff --git a/src/libnetdata/dictionary/dictionary.c b/src/libnetdata/dictionary/dictionary.c
index 9d50ed62c..ebe67269a 100644
--- a/src/libnetdata/dictionary/dictionary.c
+++ b/src/libnetdata/dictionary/dictionary.c
@@ -318,10 +318,11 @@ static void dictionary_queue_for_destruction(DICTIONARY *dict) {
}
void cleanup_destroyed_dictionaries(void) {
- if(!dictionaries_waiting_to_be_destroyed)
- return;
-
netdata_mutex_lock(&dictionaries_waiting_to_be_destroyed_mutex);
+ if (!dictionaries_waiting_to_be_destroyed) {
+ netdata_mutex_unlock(&dictionaries_waiting_to_be_destroyed_mutex);
+ return;
+ }
DICTIONARY *dict, *last = NULL, *next = NULL;
for(dict = dictionaries_waiting_to_be_destroyed; dict ; dict = next) {
@@ -497,8 +498,8 @@ static DICTIONARY *dictionary_create_internal(DICT_OPTIONS options, struct dicti
else
dict->value_aral = NULL;
- if(!(dict->options & (DICT_OPTION_INDEX_JUDY|DICT_OPTION_INDEX_HASHTABLE)))
- dict->options |= DICT_OPTION_INDEX_JUDY;
+// if(!(dict->options & (DICT_OPTION_INDEX_JUDY|DICT_OPTION_INDEX_HASHTABLE)))
+ dict->options |= DICT_OPTION_INDEX_JUDY;
size_t dict_size = 0;
dict_size += sizeof(DICTIONARY);
diff --git a/src/libnetdata/dictionary/dictionary.h b/src/libnetdata/dictionary/dictionary.h
index 231fbfebd..3d041018d 100644
--- a/src/libnetdata/dictionary/dictionary.h
+++ b/src/libnetdata/dictionary/dictionary.h
@@ -59,7 +59,7 @@ typedef enum __attribute__((packed)) dictionary_options {
DICT_OPTION_ADD_IN_FRONT = (1 << 4), // add dictionary items at the front of the linked list (default: at the end)
DICT_OPTION_FIXED_SIZE = (1 << 5), // the items of the dictionary have a fixed size
DICT_OPTION_INDEX_JUDY = (1 << 6), // the default, if no other indexing is set
- DICT_OPTION_INDEX_HASHTABLE = (1 << 7), // use SIMPLE_HASHTABLE for indexing
+// DICT_OPTION_INDEX_HASHTABLE = (1 << 7), // use SIMPLE_HASHTABLE for indexing
} DICT_OPTIONS;
struct dictionary_stats {
@@ -299,7 +299,8 @@ typedef DICTFE_CONST struct dictionary_foreach {
#define dfe_start_rw(dict, value, mode) \
do { \
- DICTFE value ## _dfe = {}; \
+ /* automatically cleanup DFE, to allow using return from within the loop */ \
+ DICTFE _cleanup_(dictionary_foreach_done) value ## _dfe = {}; \
(void)(value); /* needed to avoid warning when looping without using this */ \
for((value) = dictionary_foreach_start_rw(&value ## _dfe, (dict), (mode)); \
(value ## _dfe.item) || (value) ; \
@@ -308,7 +309,6 @@ typedef DICTFE_CONST struct dictionary_foreach {
#define dfe_done(value) \
} \
- dictionary_foreach_done(&value ## _dfe); \
} while(0)
#define dfe_unlock(value) dictionary_foreach_unlock(&value ## _dfe)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 08:05:20 +0000