kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-14 08:05:37 +00:00
Code Issues Projects Releases Wiki Activity

FS-10167: Fixed a bug with ks_hash related to keying with INT/INT64/PTR modes, testhash now runs successfully on windows as well.

Browse Source
This commit is contained in:
Shane Bryldt 2017-03-23 14:36:46 -06:00
parent e8d90bf987
commit 713aa5dc2e
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/libks/src/include/ks_platform.h
View File

@ -52,6 +52,8 @@ KS_BEGIN_EXTERN_C
#define _GNU_SOURCE #define _GNU_SOURCE
#endif #endif
#include <stdint.h>
#if UINTPTR_MAX == 0xffffffffffffffff #if UINTPTR_MAX == 0xffffffffffffffff
#define KS_64BIT 1 #define KS_64BIT 1
#endif #endif

27
libs/libks/src/ks_hash.c
View File

@ -76,10 +76,19 @@ hash(ks_hash_t *h, void *k)
{ {
unsigned int i; unsigned int i;
if (h->mode == KS_HASH_MODE_ARBITRARY) { switch (h->mode)
{
case KS_HASH_MODE_ARBITRARY:
i = ks_hash_default_arbitrary(k, h->keysize, 13); i = ks_hash_default_arbitrary(k, h->keysize, 13);
} else { break;
case KS_HASH_MODE_INT:
case KS_HASH_MODE_INT64:
case KS_HASH_MODE_PTR:
i = h->hashfn((void *)&k);
break;
default:
i = h->hashfn(k); i = h->hashfn(k);
break;
} }
/* Aim to protect against poor hash functions by adding logic here /* Aim to protect against poor hash functions by adding logic here
@ -332,11 +341,17 @@ ks_hash_count(ks_hash_t *h)
static int key_equals(ks_hash_t *h, void *k1, void *k2) static int key_equals(ks_hash_t *h, void *k1, void *k2)
{ {
if (h->mode == KS_HASH_MODE_ARBITRARY) { switch (h->mode)
{
case KS_HASH_MODE_ARBITRARY:
return !memcmp(k1, k2, h->keysize); return !memcmp(k1, k2, h->keysize);
} else { case KS_HASH_MODE_INT:
return h->eqfn(k1, k2); case KS_HASH_MODE_INT64:
case KS_HASH_MODE_PTR:
return h->eqfn(&k1, &k2);
default: break;
} }
return h->eqfn(k1, k2);
} }
static void * _ks_hash_remove(ks_hash_t *h, void *k, unsigned int hashvalue, unsigned int index) { static void * _ks_hash_remove(ks_hash_t *h, void *k, unsigned int hashvalue, unsigned int index) {
@ -384,7 +399,7 @@ ks_hash_insert_ex(ks_hash_t *h, void *k, void *v, ks_hash_flag_t flags, ks_hash_
{ {
struct entry *e; struct entry *e;
unsigned int hashvalue = hash(h, k); unsigned int hashvalue = hash(h, k);
unsigned index = indexFor(h->tablelength, hashvalue); unsigned int index = indexFor(h->tablelength, hashvalue);
ks_hash_write_lock(h); ks_hash_write_lock(h);

2
libs/libks/test/testhash.c
View File

@ -68,7 +68,7 @@ static void *test2_thread(ks_thread_t *thread, void *data)
int test2(void) int test2(void)
{ {
ks_thread_t *threads[MAX]; ks_thread_t *threads[MAX];
int ttl = 1; int ttl = 5;
int runs = 5; int runs = 5;
ks_pool_t *pool; ks_pool_t *pool;
ks_hash_t *hash; ks_hash_t *hash;