diff options
author | Bartosz Taudul <bartosz.taudul@game-lion.com> | 2019-06-13 15:15:17 +0300 |
---|---|---|
committer | Bartosz Taudul <bartosz.taudul@game-lion.com> | 2019-06-13 15:15:17 +0300 |
commit | 31a4a45b14c577f8b21fa1049d5b6da405280bd2 (patch) | |
tree | d9bc5c5933b968d95747deaf29bc2a105cc2229f /server/TracyWorker.cpp | |
parent | ab4e99229d2dd2ca3e8f0829788e48d4555ade83 (diff) |
Ignore memory free faults if running on apple.
There's a case in MoltenVK initialization where overloading operator new
and operator delete works for std::string destruction, but not
construction.
Diffstat (limited to 'server/TracyWorker.cpp')
-rw-r--r-- | server/TracyWorker.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index 7ea2a0da..3c85a0db 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -1831,6 +1831,7 @@ void Worker::Exec() m_onDemand = welcome.onDemand; m_captureProgram = welcome.programName; m_captureTime = welcome.epoch; + m_ignoreMemFreeFaults = welcome.onDemand || welcome.isApple; char dtmp[64]; time_t date = welcome.epoch; @@ -3513,7 +3514,7 @@ bool Worker::ProcessMemFree( const QueueMemFree& ev ) auto it = m_data.memory.active.find( ev.ptr ); if( it == m_data.memory.active.end() ) { - if( !m_onDemand ) + if( !m_ignoreMemFreeFaults ) { MemFreeFailure( ev.thread ); } |