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

Fix decay tests for --disable-tcache case.

Browse Source
This commit is contained in:
Jason Evans 2016-02-27 23:40:31 -08:00
parent 39f58755a7
commit 7d3055432d
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/unit/decay.c
View File

@ -160,7 +160,7 @@ TEST_BEGIN(test_decay_ticks)
* Test tcache fill/flush interactions for large and small size classes, * Test tcache fill/flush interactions for large and small size classes,
* using an explicit tcache. * using an explicit tcache.
*/ */
{ if (config_tcache) {
unsigned tcache_ind, i; unsigned tcache_ind, i;
size_t tcache_sizes[2]; size_t tcache_sizes[2];
tcache_sizes[0] = large0; tcache_sizes[0] = large0;
@ -204,7 +204,7 @@ TEST_BEGIN(test_decay_ticker)
uint64_t epoch; uint64_t epoch;
uint64_t npurge0 = 0; uint64_t npurge0 = 0;
uint64_t npurge1 = 0; uint64_t npurge1 = 0;
size_t sz, tcache_max, large; size_t sz, large;
unsigned i, nupdates0; unsigned i, nupdates0;
nstime_t time, decay_time, deadline; nstime_t time, decay_time, deadline;
@ -216,10 +216,18 @@ TEST_BEGIN(test_decay_ticker)
* verify the ticker triggers purging. * verify the ticker triggers purging.
*/ */
if (config_tcache) {
size_t tcache_max;
sz = sizeof(size_t); sz = sizeof(size_t);
assert_d_eq(mallctl("arenas.tcache_max", &tcache_max, &sz, NULL, 0), 0, assert_d_eq(mallctl("arenas.tcache_max", &tcache_max, &sz, NULL,
"Unexpected mallctl failure"); 0), 0, "Unexpected mallctl failure");
large = nallocx(tcache_max + 1, flags); large = nallocx(tcache_max + 1, flags);
} else {
sz = sizeof(size_t);
assert_d_eq(mallctl("arenas.lrun.0.size", &large, &sz, NULL, 0),
0, "Unexpected mallctl failure");
}
assert_d_eq(mallctl("arena.0.purge", NULL, NULL, NULL, 0), 0, assert_d_eq(mallctl("arena.0.purge", NULL, NULL, NULL, 0), 0,
"Unexpected mallctl failure"); "Unexpected mallctl failure");