diff options
| -rw-r--r-- | contrib/uthash/uthash.h | 4 | ||||
| -rw-r--r-- | src/libutil/uthash_strcase.h | 38 |
2 files changed, 41 insertions, 1 deletions
diff --git a/contrib/uthash/uthash.h b/contrib/uthash/uthash.h index 797c21c31..824bb2a76 100644 --- a/contrib/uthash/uthash.h +++ b/contrib/uthash/uthash.h @@ -592,7 +592,9 @@ do { \ #endif /* HASH_USING_NO_STRICT_ALIASING */ /* key comparison function; return 0 if keys equal */ -#define HASH_KEYCMP(a,b,len) memcmp(a,b,len) +#ifndef HASH_KEYCMP +#define HASH_KEYCMP(a,b,len) memcmp(a,b,len) +#endif /* iterate over items in a known bucket to find desired item */ #define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,out) \ diff --git a/src/libutil/uthash_strcase.h b/src/libutil/uthash_strcase.h new file mode 100644 index 000000000..1b4024cc6 --- /dev/null +++ b/src/libutil/uthash_strcase.h @@ -0,0 +1,38 @@ +/* Copyright (c) 2014, Vsevolod Stakhov + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef UTHASH_STRCASE_H_ +#define UTHASH_STRCASE_H_ + +#include "xxhash.h" + +/* Utils for uthash tuning */ +#define HASH_FUNCTION(key,keylen,num_bkts,hashv,bkt) do {\ + hashv = XXH32(key, keylen, 0); \ + bkt = (hashv) & (num_bkts-1); \ +} while (0) + +#define HASH_KEYCMP(a,b,len) strncasecmp(a,b,len) + +#include "uthash.h" + +#endif /* UTHASH_STRCASE_H_ */ |