Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 124 insertions, 118 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