diff options
Diffstat (limited to 'src/ucl_hash.c')
| -rw-r--r-- | src/ucl_hash.c | 171 |
1 files changed, 152 insertions, 19 deletions
diff --git a/src/ucl_hash.c b/src/ucl_hash.c index 275e84d478aa..7de8196fa014 100644 --- a/src/ucl_hash.c +++ b/src/ucl_hash.c @@ -26,6 +26,9 @@ #include "khash.h" #include "kvec.h" +#include <time.h> +#include <limits.h> + struct ucl_hash_elt { const ucl_object_t *obj; size_t ar_idx; @@ -37,11 +40,78 @@ struct ucl_hash_struct { bool caseless; }; +static uint64_t +ucl_hash_seed (void) +{ + static uint64_t seed; + + if (seed == 0) { +#ifdef UCL_RANDOM_FUNCTION + seed = UCL_RANDOM_FUNCTION; +#else + /* Not very random but can be useful for our purposes */ + seed = time (NULL); +#endif + } + + return seed; +} + +static const unsigned char lc_map[256] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, + 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, + 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + 0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, + 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, + 0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, + 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, + 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, + 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, + 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, + 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, + 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, + 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, + 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, + 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, + 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, + 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, + 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, + 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, + 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, + 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, + 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff +}; + +#if (defined(WORD_BIT) && WORD_BIT == 64) || \ + (defined(__WORDSIZE) && __WORDSIZE == 64) || \ + defined(__x86_64__) || \ + defined(__amd64__) +#define UCL64_BIT_HASH 1 +#endif + +#ifdef UCL64_BIT_HASH +static inline uint32_t +ucl_hash_func (const ucl_object_t *o) +{ + return XXH64 (o->key, o->keylen, ucl_hash_seed ()); +} +#else static inline uint32_t ucl_hash_func (const ucl_object_t *o) { - return XXH32 (o->key, o->keylen, 0xdeadbeef); + return XXH32 (o->key, o->keylen, ucl_hash_seed ()); } +#endif static inline int ucl_hash_equal (const ucl_object_t *k1, const ucl_object_t *k2) @@ -56,33 +126,91 @@ ucl_hash_equal (const ucl_object_t *k1, const ucl_object_t *k2) KHASH_INIT (ucl_hash_node, const ucl_object_t *, struct ucl_hash_elt, 1, ucl_hash_func, ucl_hash_equal) +#ifdef UCL64_BIT_HASH static inline uint32_t ucl_hash_caseless_func (const ucl_object_t *o) { - void *xxh = XXH32_init (0xdeadbeef); - char hash_buf[64], *c; - const char *p; - ssize_t remain = o->keylen; + unsigned len = o->keylen; + unsigned leftover = o->keylen % 4; + unsigned fp, i; + const uint8_t* s = (const uint8_t*)o->key; + union { + struct { + unsigned char c1, c2, c3, c4; + } c; + uint32_t pp; + } u; + XXH64_state_t st; - p = o->key; - c = &hash_buf[0]; + fp = len - leftover; + XXH64_reset (&st, ucl_hash_seed ()); - while (remain > 0) { - *c++ = tolower (*p++); + for (i = 0; i != fp; i += 4) { + u.c.c1 = s[i], u.c.c2 = s[i + 1], u.c.c3 = s[i + 2], u.c.c4 = s[i + 3]; + u.c.c1 = lc_map[u.c.c1]; + u.c.c2 = lc_map[u.c.c2]; + u.c.c3 = lc_map[u.c.c3]; + u.c.c4 = lc_map[u.c.c4]; + XXH64_update (&st, &u.pp, sizeof (u)); + } - if (c - &hash_buf[0] == sizeof (hash_buf)) { - XXH32_update (xxh, hash_buf, sizeof (hash_buf)); - c = &hash_buf[0]; - } - remain --; + u.pp = 0; + switch (leftover) { + case 3: + u.c.c3 = lc_map[(unsigned char)s[i++]]; + case 2: + u.c.c2 = lc_map[(unsigned char)s[i++]]; + case 1: + u.c.c1 = lc_map[(unsigned char)s[i]]; + XXH64_update (&st, &u.pp, leftover); + break; } - if (c - &hash_buf[0] != 0) { - XXH32_update (xxh, hash_buf, c - &hash_buf[0]); + return XXH64_digest (&st); +} +#else +static inline uint32_t +ucl_hash_caseless_func (const ucl_object_t *o) +{ + unsigned len = o->keylen; + unsigned leftover = o->keylen % 4; + unsigned fp, i; + const uint8_t* s = (const uint8_t*)o->key; + union { + struct { + unsigned char c1, c2, c3, c4; + } c; + uint32_t pp; + } u; + XXH32_state_t st; + + fp = len - leftover; + XXH32_reset (&st, ucl_hash_seed ()); + + for (i = 0; i != fp; i += 4) { + u.c.c1 = s[i], u.c.c2 = s[i + 1], u.c.c3 = s[i + 2], u.c.c4 = s[i + 3]; + u.c.c1 = lc_map[u.c.c1]; + u.c.c2 = lc_map[u.c.c2]; + u.c.c3 = lc_map[u.c.c3]; + u.c.c4 = lc_map[u.c.c4]; + XXH32_update (&st, &u.pp, sizeof (u)); + } + + u.pp = 0; + switch (leftover) { + case 3: + u.c.c3 = lc_map[(unsigned char)s[i++]]; + case 2: + u.c.c2 = lc_map[(unsigned char)s[i++]]; + case 1: + u.c.c1 = lc_map[(unsigned char)s[i]]; + XXH32_update (&st, &u.pp, leftover); + break; } - return XXH32_digest (xxh); + return XXH32_digest (&st); } +#endif static inline int ucl_hash_caseless_equal (const ucl_object_t *k1, const ucl_object_t *k2) @@ -254,6 +382,11 @@ ucl_hash_iterate (ucl_hash_t *hashlin, ucl_hash_iter_t *iter) if (it == NULL) { it = UCL_ALLOC (sizeof (*it)); + + if (it == NULL) { + return NULL; + } + it->cur = &hashlin->ar.a[0]; it->end = it->cur + hashlin->ar.n; } @@ -336,7 +469,7 @@ ucl_hash_delete (ucl_hash_t* hashlin, const ucl_object_t *obj) k = kh_get (ucl_hash_caseless_node, h, obj); if (k != kh_end (h)) { elt = &kh_value (h, k); - kv_A (hashlin->ar, elt->ar_idx) = NULL; + kv_del (const ucl_object_t *, hashlin->ar, elt->ar_idx); kh_del (ucl_hash_caseless_node, h, k); } } @@ -346,7 +479,7 @@ ucl_hash_delete (ucl_hash_t* hashlin, const ucl_object_t *obj) k = kh_get (ucl_hash_node, h, obj); if (k != kh_end (h)) { elt = &kh_value (h, k); - kv_A (hashlin->ar, elt->ar_idx) = NULL; + kv_del (const ucl_object_t *, hashlin->ar, elt->ar_idx); kh_del (ucl_hash_node, h, k); } } |