kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-05 06:59:32 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into dev-win

Browse source
This commit is contained in:
daan 2019-08-20 07:50:03 -07:00
commit a5071eb510
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mimalloc.h
View file

@ -237,8 +237,10 @@ typedef enum mi_option_e {
mi_decl_export bool mi_option_is_enabled(mi_option_t option); 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(mi_option_t option);
mi_decl_export void mi_option_enable_default(mi_option_t option, bool enable); 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 long mi_option_get(mi_option_t option);
mi_decl_export void mi_option_set(mi_option_t option, long value); mi_decl_export void mi_option_set(mi_option_t option, long value);

13
src/options.c
View file

@ -103,14 +103,23 @@ bool mi_option_is_enabled(mi_option_t option) {
return (mi_option_get(option) != 0); 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)); 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)); 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 // Messages
// -------------------------------------------------------- // --------------------------------------------------------

2
test/test-api.c
View file

@ -66,7 +66,7 @@ bool test_heap2();
// Main testing // Main testing
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
int main() { int main() {
mi_option_enable(mi_option_verbose,false); mi_option_disable(mi_option_verbose);
// --------------------------------------------------- // ---------------------------------------------------
// Malloc // Malloc