From 03d994648af1df2104858aac2eb08f1433894734 Mon Sep 17 00:00:00 2001 From: daan Date: Tue, 20 Aug 2019 07:47:50 -0700 Subject: [PATCH 1/2] better option interface: option_enable, option_disable, and option_set_enabled --- include/mimalloc.h | 6 ++++-- src/options.c | 13 +++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/include/mimalloc.h b/include/mimalloc.h index 9106fdea..6615e2e2 100644 --- a/include/mimalloc.h +++ b/include/mimalloc.h @@ -236,8 +236,10 @@ typedef enum mi_option_e { mi_decl_export bool mi_option_is_enabled(mi_option_t option); -mi_decl_export void mi_option_enable(mi_option_t option, bool enable); -mi_decl_export void mi_option_enable_default(mi_option_t option, bool enable); +mi_decl_export void mi_option_enable(mi_option_t option); +mi_decl_export void mi_option_disable(mi_option_t option); +mi_decl_export void mi_option_set_enabled(mi_option_t option, bool enable); +mi_decl_export void mi_option_set_enabled_default(mi_option_t option, bool enable); mi_decl_export long mi_option_get(mi_option_t option); mi_decl_export void mi_option_set(mi_option_t option, long value); diff --git a/src/options.c b/src/options.c index de1ef079..67a55d36 100644 --- a/src/options.c +++ b/src/options.c @@ -102,14 +102,23 @@ bool mi_option_is_enabled(mi_option_t option) { return (mi_option_get(option) != 0); } -void mi_option_enable(mi_option_t option, bool enable) { +void mi_option_set_enabled(mi_option_t option, bool enable) { mi_option_set(option, (enable ? 1 : 0)); } -void mi_option_enable_default(mi_option_t option, bool enable) { +void mi_option_set_enabled_default(mi_option_t option, bool enable) { mi_option_set_default(option, (enable ? 1 : 0)); } +void mi_option_enable(mi_option_t option) { + mi_option_set_enabled(option,true); +} + +void mi_option_disable(mi_option_t option) { + mi_option_set_enabled(option,false); +} + + // -------------------------------------------------------- // Messages // -------------------------------------------------------- From 27d794b5f491fe45f1bc8db438f36390801549a7 Mon Sep 17 00:00:00 2001 From: daan Date: Tue, 20 Aug 2019 07:49:40 -0700 Subject: [PATCH 2/2] fix option_enable call --- test/test-api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-api.c b/test/test-api.c index f4e32746..a5f61074 100644 --- a/test/test-api.c +++ b/test/test-api.c @@ -66,7 +66,7 @@ bool test_heap2(); // Main testing // --------------------------------------------------------------------------- int main() { - mi_option_enable(mi_option_verbose,false); + mi_option_disable(mi_option_verbose); // --------------------------------------------------- // Malloc