Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor additions to khash #115

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Minor additions to khash #115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3eb6c97
Add kh_reset
dalcinl Nov 29, 2018
8e9e4d6
Add khash foreach key macro
dalcinl Nov 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions khash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ static const double __ac_HASH_UPPER = 0.77;
#define __KHASH_PROTOTYPES(name, khkey_t, khval_t) \
extern kh_##name##_t *kh_init_##name(void); \
extern void kh_destroy_##name(kh_##name##_t *h); \
extern void kh_reset_##name(kh_##name##_t *h); \
extern void kh_clear_##name(kh_##name##_t *h); \
extern khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); \
extern int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \
Expand All @@ -220,6 +221,14 @@ static const double __ac_HASH_UPPER = 0.77;
kfree(h); \
} \
} \
SCOPE void kh_reset_##name(kh_##name##_t *h) \
{ \
if (h) { \
kfree(h->keys); kfree(h->flags); \
kfree(h->vals); \
memset(h, 0x00, sizeof(*h)); \
} \
} \
SCOPE void kh_clear_##name(kh_##name##_t *h) \
{ \
if (h && h->flags) { \
Expand Down Expand Up @@ -445,6 +454,13 @@ static kh_inline khint_t __ac_Wang_hash(khint_t key)
*/
#define kh_destroy(name, h) kh_destroy_##name(h)

/*! @function
@abstract Reset a hash table to initial state deallocating memory.
@param name Name of the hash table [symbol]
@param h Pointer to the hash table [khash_t(name)*]
*/
#define kh_reset(name, h) kh_reset_##name(h)

/*! @function
@abstract Reset a hash table without deallocating memory.
@param name Name of the hash table [symbol]
Expand Down Expand Up @@ -563,6 +579,19 @@ static kh_inline khint_t __ac_Wang_hash(khint_t key)
code; \
} }

/*! @function
@abstract Iterate over the keys in the hash table
@param h Pointer to the hash table [khash_t(name)*]
@param kvar Variable to which key will be assigned
@param code Block of code to execute
*/
#define kh_foreach_key(h, kvar, code) { khint_t __i; \
for (__i = kh_begin(h); __i != kh_end(h); ++__i) { \
if (!kh_exist(h,__i)) continue; \
(kvar) = kh_key(h,__i); \
code; \
} }

/*! @function
@abstract Iterate over the values in the hash table
@param h Pointer to the hash table [khash_t(name)*]
Expand Down