[Bf-blender-cvs] [44f18ce0a6e] master: Windows: Disable tbbmalloc for debug builds.

Ray Molenkamp noreply at git.blender.org
Sat Nov 23 17:21:40 CET 2019


Commit: 44f18ce0a6e56156c3bd67f7080b06af11e502bf
Author: Ray Molenkamp
Date:   Sat Nov 23 09:21:34 2019 -0700
Branches: master
https://developer.blender.org/rB44f18ce0a6e56156c3bd67f7080b06af11e502bf

Windows: Disable tbbmalloc for debug builds.

TBBMalloc seems to have a race condition somewhere on shutdown
that seems to show up in debug builds only, ideally we find the
issue and send a patch upstream but due to its racy nature it
has eluded capture so far. This patch disables TBBMalloc for
debug builds so that developers that actually need to get some
work done can work without being bothered by this misbehaviour.

===================================================================

M	source/creator/creator.c

===================================================================

diff --git a/source/creator/creator.c b/source/creator/creator.c
index f6c2b707c8f..f4f5e3dcbde 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -29,7 +29,7 @@
 #  include "utfconv.h"
 #endif
 
-#if defined(WITH_TBB_MALLOC) && defined(_MSC_VER)
+#if defined(WITH_TBB_MALLOC) && defined(_MSC_VER) && defined(NDEBUG)
 #  pragma comment(lib, "tbbmalloc_proxy.lib")
 #  pragma comment(linker, "/include:__TBB_malloc_proxy")
 #endif



More information about the Bf-blender-cvs mailing list