43,44c43,44
< static bool ckh_grow(tsd_t *tsd, ckh_t *ckh);
< static void ckh_shrink(tsd_t *tsd, ckh_t *ckh);
---
> static bool ckh_grow(tsdn_t *tsdn, ckh_t *ckh);
> static void ckh_shrink(tsdn_t *tsdn, ckh_t *ckh);
247c247
< ckh_grow(tsd_t *tsd, ckh_t *ckh)
---
> ckh_grow(tsdn_t *tsdn, ckh_t *ckh)
273,274c273,274
< tab = (ckhc_t *)ipallocztm(tsd, usize, CACHELINE, true, NULL,
< true, NULL);
---
> tab = (ckhc_t *)ipallocztm(tsdn, usize, CACHELINE, true, NULL,
> true, arena_ichoose(tsdn, NULL));
286c286
< idalloctm(tsd, tab, tcache_get(tsd, false), true, true);
---
> idalloctm(tsdn, tab, NULL, true, true);
291c291
< idalloctm(tsd, ckh->tab, tcache_get(tsd, false), true, true);
---
> idalloctm(tsdn, ckh->tab, NULL, true, true);
302c302
< ckh_shrink(tsd_t *tsd, ckh_t *ckh)
---
> ckh_shrink(tsdn_t *tsdn, ckh_t *ckh)
317,318c317,318
< tab = (ckhc_t *)ipallocztm(tsd, usize, CACHELINE, true, NULL, true,
< NULL);
---
> tab = (ckhc_t *)ipallocztm(tsdn, usize, CACHELINE, true, NULL, true,
> arena_ichoose(tsdn, NULL));
333c333
< idalloctm(tsd, tab, tcache_get(tsd, false), true, true);
---
> idalloctm(tsdn, tab, NULL, true, true);
341c341
< idalloctm(tsd, ckh->tab, tcache_get(tsd, false), true, true);
---
> idalloctm(tsdn, ckh->tab, NULL, true, true);
350c350
< ckh_new(tsd_t *tsd, ckh_t *ckh, size_t minitems, ckh_hash_t *hash,
---
> ckh_new(tsdn_t *tsdn, ckh_t *ckh, size_t minitems, ckh_hash_t *hash,
394,395c394,395
< ckh->tab = (ckhc_t *)ipallocztm(tsd, usize, CACHELINE, true, NULL, true,
< NULL);
---
> ckh->tab = (ckhc_t *)ipallocztm(tsdn, usize, CACHELINE, true, NULL,
> true, arena_ichoose(tsdn, NULL));
407c407
< ckh_delete(tsd_t *tsd, ckh_t *ckh)
---
> ckh_delete(tsdn_t *tsdn, ckh_t *ckh)
424c424
< idalloctm(tsd, ckh->tab, tcache_get(tsd, false), true, true);
---
> idalloctm(tsdn, ckh->tab, NULL, true, true);
426c426
< memset(ckh, 0x5a, sizeof(ckh_t));
---
> memset(ckh, JEMALLOC_FREE_JUNK, sizeof(ckh_t));
459c459
< ckh_insert(tsd_t *tsd, ckh_t *ckh, const void *key, const void *data)
---
> ckh_insert(tsdn_t *tsdn, ckh_t *ckh, const void *key, const void *data)
471c471
< if (ckh_grow(tsd, ckh)) {
---
> if (ckh_grow(tsdn, ckh)) {
483c483
< ckh_remove(tsd_t *tsd, ckh_t *ckh, const void *searchkey, void **key,
---
> ckh_remove(tsdn_t *tsdn, ckh_t *ckh, const void *searchkey, void **key,
505c505
< ckh_shrink(tsd, ckh);
---
> ckh_shrink(tsdn, ckh);