project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix size class calculation for sec

Browse Source 
Due to a bug in sec initialization, the number of cached size classes
was equal to 198. The bug caused the creation of more than a hundred of
unused bins, although it didn't affect the caching logic.
This commit is contained in:
Alex Lapenkou 2022-03-14 20:17:14 -07:00 committed by Alexander Lapenkov
parent 7ae0f15c59
commit 52631c90f6
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/sec.c
View File

@ -23,11 +23,11 @@ sec_bin_init(sec_bin_t *bin) {
bool bool
sec_init(tsdn_t *tsdn, sec_t *sec, base_t *base, pai_t *fallback, sec_init(tsdn_t *tsdn, sec_t *sec, base_t *base, pai_t *fallback,
const sec_opts_t *opts) { const sec_opts_t *opts) {
size_t max_alloc = opts->max_alloc & PAGE_MASK; assert(opts->max_alloc > 0);
pszind_t npsizes = sz_psz2ind(max_alloc);
if (sz_pind2sz(npsizes) > opts->max_alloc) { size_t max_alloc = opts->max_alloc & ~PAGE_MASK;
npsizes--; pszind_t npsizes = sz_psz2ind(max_alloc) + 1;
}
size_t sz_shards = opts->nshards * sizeof(sec_shard_t); size_t sz_shards = opts->nshards * sizeof(sec_shard_t);
size_t sz_bins = opts->nshards * (size_t)npsizes * sizeof(sec_bin_t); size_t sz_bins = opts->nshards * (size_t)npsizes * sizeof(sec_bin_t);
size_t sz_alloc = sz_shards + sz_bins; size_t sz_alloc = sz_shards + sz_bins;
@ -232,6 +232,8 @@ sec_alloc(tsdn_t *tsdn, pai_t *self, size_t size, size_t alignment, bool zero,
deferred_work_generated); deferred_work_generated);
} }
pszind_t pszind = sz_psz2ind(size); pszind_t pszind = sz_psz2ind(size);
assert(pszind < sec->npsizes);
sec_shard_t *shard = sec_shard_pick(tsdn, sec); sec_shard_t *shard = sec_shard_pick(tsdn, sec);
sec_bin_t *bin = &shard->bins[pszind]; sec_bin_t *bin = &shard->bins[pszind];
bool do_batch_fill = false; bool do_batch_fill = false;
@ -305,6 +307,7 @@ sec_shard_dalloc_and_unlock(tsdn_t *tsdn, sec_t *sec, sec_shard_t *shard,
assert(shard->bytes_cur <= sec->opts.max_bytes); assert(shard->bytes_cur <= sec->opts.max_bytes);
size_t size = edata_size_get(edata); size_t size = edata_size_get(edata);
pszind_t pszind = sz_psz2ind(size); pszind_t pszind = sz_psz2ind(size);
assert(pszind < sec->npsizes);
/* /*
* Prepending here results in LIFO allocation per bin, which seems * Prepending here results in LIFO allocation per bin, which seems
* reasonable. * reasonable.

1
test/unit/sec.c
View File

@ -46,6 +46,7 @@ test_sec_init(sec_t *sec, pai_t *fallback, size_t nshards, size_t max_alloc,
bool err = sec_init(TSDN_NULL, sec, base, fallback, &opts); bool err = sec_init(TSDN_NULL, sec, base, fallback, &opts);
assert_false(err, "Unexpected initialization failure"); assert_false(err, "Unexpected initialization failure");
assert_u_ge(sec->npsizes, 0, "Zero size classes allowed for caching");
} }
static inline edata_t * static inline edata_t *