78f28b55d3
Both, the guarded and lockfree allocator, are keeping track of current and peak memory usage. Even the lockfree allocator used to use a global atomic variable for the memory usage. When multiple threads use the allocator at the same time, this variable is highly contended. This can result in significant slowdowns as presented in D16862. While specific cases could always be optimized by reducing the number of allocations, having this synchronization point in functions used by almost every part of Blender is not great. The solution is use thread-local memory counters which are only added together when the memory usage is actually requested. For more details see in-code comments and D16862. Differential Revision: https://developer.blender.org/D16862
81 lines
1.6 KiB
CMake
81 lines
1.6 KiB
CMake
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
# Copyright 2006 Blender Foundation. All rights reserved.
|
|
|
|
if(HAVE_MALLOC_STATS_H)
|
|
add_definitions(-DHAVE_MALLOC_STATS_H)
|
|
endif()
|
|
|
|
set(INC
|
|
.
|
|
..
|
|
../atomic
|
|
)
|
|
|
|
set(INC_SYS
|
|
|
|
)
|
|
|
|
set(SRC
|
|
./intern/leak_detector.cc
|
|
./intern/mallocn.c
|
|
./intern/mallocn_guarded_impl.c
|
|
./intern/mallocn_lockfree_impl.c
|
|
./intern/memory_usage.cc
|
|
|
|
MEM_guardedalloc.h
|
|
./intern/mallocn_inline.h
|
|
./intern/mallocn_intern.h
|
|
|
|
# only so the header is known by cmake
|
|
../atomic/atomic_ops.h
|
|
../atomic/intern/atomic_ops_ext.h
|
|
../atomic/intern/atomic_ops_msvc.h
|
|
../atomic/intern/atomic_ops_unix.h
|
|
../atomic/intern/atomic_ops_utils.h
|
|
)
|
|
|
|
set(LIB
|
|
)
|
|
|
|
if(WIN32 AND NOT UNIX)
|
|
list(APPEND INC_SYS
|
|
${PTHREADS_INC}
|
|
)
|
|
|
|
list(APPEND LIB
|
|
${PTHREADS_LIBRARIES}
|
|
)
|
|
endif()
|
|
|
|
# Jemalloc 5.0.0+ needs extra configuration.
|
|
if(WITH_MEM_JEMALLOC AND NOT ("${JEMALLOC_VERSION}" VERSION_LESS "5.0.0"))
|
|
add_definitions(-DWITH_JEMALLOC_CONF)
|
|
endif()
|
|
|
|
blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
|
|
|
# Override C++ alloc, optional.
|
|
if(WITH_CXX_GUARDEDALLOC)
|
|
set(SRC
|
|
cpp/mallocn.cpp
|
|
)
|
|
blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
|
endif()
|
|
|
|
if(WITH_GTESTS)
|
|
set(TEST_SRC
|
|
tests/guardedalloc_alignment_test.cc
|
|
tests/guardedalloc_overflow_test.cc
|
|
tests/guardedalloc_test_base.h
|
|
)
|
|
set(TEST_INC
|
|
../../source/blender/blenlib
|
|
)
|
|
set(TEST_LIB
|
|
bf_intern_guardedalloc
|
|
bf_blenlib
|
|
)
|
|
include(GTestTesting)
|
|
blender_add_test_executable(guardedalloc "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}")
|
|
endif()
|