From e8c4cd327a7e9d9f3d9bac156f887d5664384d63 Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Wed, 1 Nov 2017 03:02:59 +0000 Subject: [fuzzer] Fix threaded stack printing Reviewers: kcc Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D39397 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@317071 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/fuzzer/FuzzerLoop.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/fuzzer') diff --git a/lib/fuzzer/FuzzerLoop.cpp b/lib/fuzzer/FuzzerLoop.cpp index d3ac4ce7e..9bea05f18 100644 --- a/lib/fuzzer/FuzzerLoop.cpp +++ b/lib/fuzzer/FuzzerLoop.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #if defined(__has_include) @@ -73,11 +74,14 @@ struct MallocFreeTracer { static MallocFreeTracer AllocTracer; +static std::mutex MallocFreeStackMutex; + ATTRIBUTE_NO_SANITIZE_MEMORY void MallocHook(const volatile void *ptr, size_t size) { size_t N = AllocTracer.Mallocs++; F->HandleMalloc(size); if (int TraceLevel = AllocTracer.TraceLevel) { + std::lock_guard Lock(MallocFreeStackMutex); Printf("MALLOC[%zd] %p %zd\n", N, ptr, size); if (TraceLevel >= 2 && EF) EF->__sanitizer_print_stack_trace(); @@ -88,6 +92,7 @@ ATTRIBUTE_NO_SANITIZE_MEMORY void FreeHook(const volatile void *ptr) { size_t N = AllocTracer.Frees++; if (int TraceLevel = AllocTracer.TraceLevel) { + std::lock_guard Lock(MallocFreeStackMutex); Printf("FREE[%zd] %p\n", N, ptr); if (TraceLevel >= 2 && EF) EF->__sanitizer_print_stack_trace(); -- cgit v1.2.3