feedc0de/boost_container
1
0
Fork 0
forked from boostorg/container
Code Pull Requests Activity

Additional fix for #148 ("Fix static initialization issues in pmr global resources") in set_default_resource

Browse Source
This commit is contained in:
Ion Gaztañaga
2020-05-24 19:00:19 +02:00
parent f3a949697b
commit 39edf046d5
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/global_resource.cpp
View File

@@ -81,6 +81,10 @@ BOOST_CONTAINER_DECL memory_resource* set_default_resource(memory_resource* r) B
//TO-DO: synchronizes-with part using atomics //TO-DO: synchronizes-with part using atomics
if(dlmalloc_global_sync_lock()){ if(dlmalloc_global_sync_lock()){
memory_resource *previous = default_memory_resource; memory_resource *previous = default_memory_resource;
if(!previous){
//function called before main, default_memory_resource is not initialized yet
previous = new_delete_resource();
}
default_memory_resource = r ? r : new_delete_resource(); default_memory_resource = r ? r : new_delete_resource();
dlmalloc_global_sync_unlock(); dlmalloc_global_sync_unlock();
return previous; return previous;
@@ -96,7 +100,7 @@ BOOST_CONTAINER_DECL memory_resource* get_default_resource() BOOST_NOEXCEPT
if(dlmalloc_global_sync_lock()){ if(dlmalloc_global_sync_lock()){
memory_resource *current = default_memory_resource; memory_resource *current = default_memory_resource;
if(!current){ if(!current){
//function called before main, default_memory resource was not initialied yet //function called before main, default_memory_resource is not initialized yet
current = new_delete_resource(); current = new_delete_resource();
} }
dlmalloc_global_sync_unlock(); dlmalloc_global_sync_unlock();