diff --git a/include/jemalloc/internal/jemalloc_init.h b/include/jemalloc/internal/jemalloc_init.h index 6e154be9..b2271e64 100644 --- a/include/jemalloc/internal/jemalloc_init.h +++ b/include/jemalloc/internal/jemalloc_init.h @@ -12,8 +12,6 @@ typedef enum malloc_init_e malloc_init_t; extern malloc_init_t malloc_init_state; bool malloc_is_initializer(void); -bool malloc_initializer_is_set(void); -void malloc_initializer_set(void); bool malloc_init_hard_a0(void); bool malloc_init_hard(void); diff --git a/src/jemalloc_init.c b/src/jemalloc_init.c index 7ef5c77d..0f7d0a4a 100644 --- a/src/jemalloc_init.c +++ b/src/jemalloc_init.c @@ -39,12 +39,14 @@ malloc_is_initializer(void) { #endif } -bool +#ifdef JEMALLOC_THREADED_INIT +static bool malloc_initializer_is_set(void) { return malloc_initializer != NO_INITIALIZER; } +#endif -void +static void malloc_initializer_set(void) { malloc_initializer = INITIALIZER; } diff --git a/test/unit/jemalloc_init.c b/test/unit/jemalloc_init.c index f8da3174..da29cb02 100644 --- a/test/unit/jemalloc_init.c +++ b/test/unit/jemalloc_init.c @@ -11,19 +11,6 @@ TEST_BEGIN(test_malloc_init_hard_idempotent) { } TEST_END -TEST_BEGIN(test_malloc_initializer_set_idempotent_on_main) { - test_skip_if(!malloc_is_initializer()); - - malloc_initializer_set(); - - expect_true(malloc_is_initializer(), - "malloc_is_initializer should still be true after re-setting " - "from the same thread"); - expect_true(malloc_initializer_is_set(), - "malloc_initializer_is_set should still be true after re-setting"); -} -TEST_END - #ifdef JEMALLOC_THREADED_INIT static atomic_b_t initializer_worker_done; static atomic_b_t initializer_worker_result; @@ -69,6 +56,5 @@ TEST_END int main(void) { return test(test_malloc_init_hard_idempotent, - test_malloc_initializer_set_idempotent_on_main, test_malloc_is_initializer_false_in_worker); }