mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 02:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use rpmalloc in concurrentqueue.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-10-14 17:19:27 +02:00
parent c497966c7f
commit 19011b3798
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/concurrentqueue.h
View File

@ -38,6 +38,8 @@
# define tracy_force_inline inline # define tracy_force_inline inline
#endif #endif
#include "TracyAlloc.hpp"
#if defined(__GNUC__) #if defined(__GNUC__)
// Disable -Wconversion warnings (spuriously triggered when Traits::size_t and // Disable -Wconversion warnings (spuriously triggered when Traits::size_t and
// Traits::index_t are set to < 32 bits, causing integer promotion, causing warnings // Traits::index_t are set to < 32 bits, causing integer promotion, causing warnings
@ -338,8 +340,8 @@ struct ConcurrentQueueDefaultTraits
static inline void* (malloc)(size_t size) { return WORKAROUND_malloc(size); } static inline void* (malloc)(size_t size) { return WORKAROUND_malloc(size); }
static inline void (free)(void* ptr) { return WORKAROUND_free(ptr); } static inline void (free)(void* ptr) { return WORKAROUND_free(ptr); }
#else #else
static inline void* malloc(size_t size) { return std::malloc(size); } static inline void* malloc(size_t size) { return tracy::tracy_malloc(size); }
static inline void free(void* ptr) { return std::free(ptr); } static inline void free(void* ptr) { return tracy::tracy_free(ptr); }
#endif #endif
#else #else
// Debug versions when running under the Relacy race detector (ignore // Debug versions when running under the Relacy race detector (ignore