diff options
| author | Jason Evans <jasone@canonware.com> | 2016-12-04 06:48:43 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2016-12-04 06:48:43 (GMT) |
| commit | f1f76357313e7dcad7262f17a48ff0a2e005fcdc (patch) | |
| tree | 826e5a42621cbd8abc9e7473437f223faccc2b0c /test/unit/prof_reset.c | |
| parent | 0110fa8451af905affd77c3bea0d545fee2251b2 (diff) | |
| parent | 2d1bb8980fff829c58dabbf122224f577879a32c (diff) | |
| download | jemalloc-4.4.0.zip jemalloc-4.4.0.tar.gz jemalloc-4.4.0.tar.bz2 | |
Merge branch 'rc-4.4.0'4.4.0
Diffstat (limited to 'test/unit/prof_reset.c')
| -rwxr-xr-x[-rw-r--r--] | test/unit/prof_reset.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/unit/prof_reset.c b/test/unit/prof_reset.c index 5ae45fd..59d7079 100644..100755 --- a/test/unit/prof_reset.c +++ b/test/unit/prof_reset.c @@ -20,8 +20,8 @@ static void set_prof_active(bool active) { - assert_d_eq(mallctl("prof.active", NULL, NULL, &active, sizeof(active)), - 0, "Unexpected mallctl failure"); + assert_d_eq(mallctl("prof.active", NULL, NULL, (void *)&active, + sizeof(active)), 0, "Unexpected mallctl failure"); } static size_t @@ -30,7 +30,8 @@ get_lg_prof_sample(void) size_t lg_prof_sample; size_t sz = sizeof(size_t); - assert_d_eq(mallctl("prof.lg_sample", &lg_prof_sample, &sz, NULL, 0), 0, + assert_d_eq(mallctl("prof.lg_sample", (void *)&lg_prof_sample, &sz, + NULL, 0), 0, "Unexpected mallctl failure while reading profiling sample rate"); return (lg_prof_sample); } @@ -39,7 +40,7 @@ static void do_prof_reset(size_t lg_prof_sample) { assert_d_eq(mallctl("prof.reset", NULL, NULL, - &lg_prof_sample, sizeof(size_t)), 0, + (void *)&lg_prof_sample, sizeof(size_t)), 0, "Unexpected mallctl failure while resetting profile data"); assert_zu_eq(lg_prof_sample, get_lg_prof_sample(), "Expected profile sample rate change"); @@ -54,8 +55,8 @@ TEST_BEGIN(test_prof_reset_basic) test_skip_if(!config_prof); sz = sizeof(size_t); - assert_d_eq(mallctl("opt.lg_prof_sample", &lg_prof_sample_orig, &sz, - NULL, 0), 0, + assert_d_eq(mallctl("opt.lg_prof_sample", (void *)&lg_prof_sample_orig, + &sz, NULL, 0), 0, "Unexpected mallctl failure while reading profiling sample rate"); assert_zu_eq(lg_prof_sample_orig, 0, "Unexpected profiling sample rate"); |