3party/mimalloc
0
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2024-12-29 06:36:09 +08:00
Code Issues Projects Releases Wiki Activity

fix c++ compilation; make default output non-atomic

Browse Source
This commit is contained in:
daan 2019-09-06 11:51:22 -07:00
parent f38fcf79eb
commit 47fc73d694
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/options.c
View File

@ -150,16 +150,18 @@ static void mi_out_stderr(const char* msg) {
// Default output handler // Default output handler
// -------------------------------------------------------- // --------------------------------------------------------
// Should be atomic but gives errors on many platforms as generally we cannot cast a function pointer to a uintptr_t.
// For now, don't register output from multiple threads.
#pragma warning(suppress:4180) #pragma warning(suppress:4180)
static volatile _Atomic(mi_output_fun*) mi_out_default; // = NULL static volatile mi_output_fun* mi_out_default; // = NULL
static mi_output_fun* mi_out_get_default(void) { static mi_output_fun* mi_out_get_default(void) {
mi_output_fun* out = (mi_output_fun*)mi_atomic_read_ptr(mi_atomic_cast(void*, &mi_out_default)); mi_output_fun* out = mi_out_default;
return (out == NULL ? &mi_out_stderr : out); return (out == NULL ? &mi_out_stderr : out);
} }
void mi_register_output(mi_output_fun* out) mi_attr_noexcept { void mi_register_output(mi_output_fun* out) mi_attr_noexcept {
mi_atomic_write_ptr(mi_atomic_cast(void*,&mi_out_default),out); mi_out_default = out;
} }