Skip to content

Commit

Permalink
Merge attractivechaos/klib#86
Browse files Browse the repository at this point in the history
  • Loading branch information
@larseggert
larseggert committed Aug 14, 2019
1 parent c87c790 commit 1e91740
Showing 1 changed file with 32 additions and 39 deletions.
71 changes: 32 additions & 39 deletions lib/include/warpcore/khash.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ int main() {
#include <string.h>

/* compiler specific configuration */
typedef unsigned char khint8_t;

#if UINT_MAX == 0xffffffffu
typedef unsigned int khint32_t;
Expand Down Expand Up @@ -163,18 +164,17 @@ typedef unsigned long long khint64_t;
typedef khint32_t khint_t;
typedef khint_t khiter_t;

#define __ac_isempty(flag, i) ((flag[i >> 4] >> ((i & 0xfU) << 1)) & 2)
#define __ac_isdel(flag, i) ((flag[i >> 4] >> ((i & 0xfU) << 1)) & 1)
#define __ac_iseither(flag, i) ((flag[i >> 4] >> ((i & 0xfU) << 1)) & 3)
#define __ac_set_isdel_false(flag, i) \
(flag[i >> 4] &= ~(1ul << ((i & 0xfU) << 1)))
#define __ac_set_isempty_false(flag, i) \
(flag[i >> 4] &= ~(2ul << ((i & 0xfU) << 1)))
#define __ac_set_isboth_false(flag, i) \
(flag[i >> 4] &= ~(3ul << ((i & 0xfU) << 1)))
#define __ac_set_isdel_true(flag, i) (flag[i >> 4] |= 1ul << ((i & 0xfU) << 1))
#define __ac_bit_empty 0x02 // 0b00000010
#define __ac_bit_deleted 0x01 // 0b00000001
#define __ac_bit_any 0xff // 0b11111111

#define __ac_fsize(m) ((m) < 16 ? 1 : (m) >> 4)
#define __ac_isempty(flag, i) (flag[i] & __ac_bit_empty)
#define __ac_isdel(flag, i) (flag[i] & __ac_bit_deleted)
#define __ac_iseither(flag, i) (flag[i] & __ac_bit_any)
#define __ac_set_isdel_false(flag, i) (flag[i] &= ~__ac_bit_deleted)
#define __ac_set_isempty_false(flag, i) (flag[i] &= ~__ac_bit_empty)
#define __ac_set_isboth_false(flag, i) (flag[i] = 0)
#define __ac_set_isdel_true(flag, i) (flag[i] |= __ac_bit_deleted)

#ifndef kroundup32
#define kroundup32(x) \
Expand All @@ -200,7 +200,7 @@ typedef khint_t khiter_t;
#define __KHASH_TYPE(name, khkey_t, khval_t) \
typedef struct kh_##name##_s { \
khint_t n_buckets, size, n_occupied, upper_bound; \
khint32_t * flags; \
khint8_t * flags; \
khkey_t * keys; \
khval_t * vals; \
} kh_##name##_t;
Expand Down Expand Up @@ -234,8 +234,7 @@ typedef khint_t khiter_t;
SCOPE void kh_clear_##name(kh_##name##_t * h) \
{ \
if (h && h->flags) { \
memset(h->flags, 0xaa, \
__ac_fsize(h->n_buckets) * sizeof(khint32_t)); \
memset(h->flags, __ac_bit_empty, h->n_buckets); \
h->size = h->n_occupied = 0; \
} \
} \
Expand Down Expand Up @@ -265,7 +264,7 @@ typedef khint_t khiter_t;
SCOPE int kh_resize_##name(kh_##name##_t * h, khint_t new_n_buckets) \
{ /* This function uses 0.25*n_buckets bytes of working space instead of \
[sizeof(key_t+val_t)+.25]*n_buckets. */ \
khint32_t * new_flags = 0; \
khint8_t * new_flags = 0; \
khint_t j = 1; \
{ \
kroundup32(new_n_buckets); \
Expand All @@ -275,12 +274,10 @@ typedef khint_t khiter_t;
j = 0; /* requested size is too small */ \
else { /* hash table size to be changed (shrink or expand); rehash \
*/ \
new_flags = (khint32_t *)kmalloc(__ac_fsize(new_n_buckets) * \
sizeof(khint32_t)); \
new_flags = (khint8_t *)kmalloc(new_n_buckets); \
if (!new_flags) \
return -1; \
memset(new_flags, 0xaa, \
__ac_fsize(new_n_buckets) * sizeof(khint32_t)); \
memset(new_flags, __ac_bit_empty, new_n_buckets); \
if (h->n_buckets < new_n_buckets) { /* expand */ \
khkey_t * new_keys = (khkey_t *)krealloc( \
(void *)h->keys, new_n_buckets * sizeof(khkey_t)); \
Expand Down Expand Up @@ -389,28 +386,24 @@ typedef khint_t khiter_t;
x = site = h->n_buckets; \
k = __hash_func(key); \
i = k & mask; \
if (__ac_isempty(h->flags, i)) \
x = i; /* for speed up */ \
else { \
last = i; \
while (!__ac_isempty(h->flags, i) && \
(__ac_isdel(h->flags, i) || \
!__hash_equal(h->keys[i], key))) { \
if (__ac_isdel(h->flags, i)) \
site = i; \
i = (i + (++step)) & mask; \
if (i == last) { \
x = site; \
break; \
} \
} \
if (x == h->n_buckets) { \
if (__ac_isempty(h->flags, i) && site != h->n_buckets) \
x = site; \
else \
x = i; \
last = i; \
while ( \
!__ac_isempty(h->flags, i) && \
(__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \
if (__ac_isdel(h->flags, i)) \
site = i; \
i = (i + (++step)) & mask; \
if (i == last) { \
x = site; \
break; \
} \
} \
if (x == h->n_buckets) { \
if (__ac_isempty(h->flags, i) && site != h->n_buckets) \
x = site; \
else \
x = i; \
} \
} \
if (__ac_isempty(h->flags, x)) { /* not present at all */ \
h->keys[x] = key; \
Expand Down

0 comments on commit 1e91740

Please sign in to comment.