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

Fix the max_background_thread test.

Browse Source 
We may set number of background threads separately, e.g. through
--with-malloc-conf, so avoid assuming the default number in the test.
This commit is contained in:
Qi Wang 2018-05-09 16:17:37 -07:00 committed by Qi Wang
parent 312352faa8
commit b293a3eb86
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
test/unit/background_thread_enable.c
View File

@ -33,20 +33,19 @@ TEST_END
TEST_BEGIN(test_max_background_threads) { TEST_BEGIN(test_max_background_threads) {
test_skip_if(!have_background_thread); test_skip_if(!have_background_thread);
size_t maxt; size_t max_n_thds;
size_t opt_maxt; size_t opt_max_n_thds;
size_t sz_m = sizeof(maxt); size_t sz_m = sizeof(max_n_thds);
assert_d_eq(mallctl("opt.max_background_threads", assert_d_eq(mallctl("opt.max_background_threads",
&opt_maxt, &sz_m, NULL, 0), 0, &opt_max_n_thds, &sz_m, NULL, 0), 0,
"Failed to get opt.max_background_threads"); "Failed to get opt.max_background_threads");
assert_d_eq(mallctl("max_background_threads", &maxt, &sz_m, NULL, 0), 0, assert_d_eq(mallctl("max_background_threads", &max_n_thds, &sz_m, NULL,
"Failed to get max background threads"); 0), 0, "Failed to get max background threads");
assert_zu_eq(20, maxt, "should be ncpus"); assert_zu_eq(opt_max_n_thds, max_n_thds,
assert_zu_eq(opt_maxt, maxt,
"max_background_threads and " "max_background_threads and "
"opt.max_background_threads should match"); "opt.max_background_threads should match");
assert_d_eq(mallctl("max_background_threads", NULL, NULL, &maxt, sz_m), assert_d_eq(mallctl("max_background_threads", NULL, NULL, &max_n_thds,
0, "Failed to set max background threads"); sz_m), 0, "Failed to set max background threads");
unsigned id; unsigned id;
size_t sz_u = sizeof(unsigned); size_t sz_u = sizeof(unsigned);
@ -60,18 +59,21 @@ TEST_BEGIN(test_max_background_threads) {
size_t sz_b = sizeof(bool); size_t sz_b = sizeof(bool);
assert_d_eq(mallctl("background_thread", NULL, NULL, &enable, sz_b), 0, assert_d_eq(mallctl("background_thread", NULL, NULL, &enable, sz_b), 0,
"Failed to enable background threads"); "Failed to enable background threads");
assert_zu_eq(n_background_threads, maxt, assert_zu_eq(n_background_threads, max_n_thds,
"Number of background threads should be 3.\n"); "Number of background threads should not change.\n");
maxt = 10; size_t new_max_thds = max_n_thds - 1;
assert_d_eq(mallctl("max_background_threads", NULL, NULL, &maxt, sz_m), if (new_max_thds > 0) {
0, "Failed to set max background threads"); assert_d_eq(mallctl("max_background_threads", NULL, NULL,
assert_zu_eq(n_background_threads, maxt, &new_max_thds, sz_m), 0,
"Number of background threads should be 10.\n"); "Failed to set max background threads");
maxt = 3; assert_zu_eq(n_background_threads, new_max_thds,
assert_d_eq(mallctl("max_background_threads", NULL, NULL, &maxt, sz_m), "Number of background threads should decrease by 1.\n");
0, "Failed to set max background threads"); }
assert_zu_eq(n_background_threads, maxt, new_max_thds = 1;
"Number of background threads should be 3.\n"); assert_d_eq(mallctl("max_background_threads", NULL, NULL, &new_max_thds,
sz_m), 0, "Failed to set max background threads");
assert_zu_eq(n_background_threads, new_max_thds,
"Number of background threads should be 1.\n");
} }
TEST_END TEST_END