Scarfski/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2026-11-10 09:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignoring mem faults also ignores repeated allocation for the same address.

Browse Source
This commit is contained in:
Bartosz Taudul
2026-07-27 19:33:55 +02:00
parent 12fdc7d8d2
commit 71c98c9dfb
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/TracyWorker.cpp
+17 -7
View File
@@ -2860,6 +2860,7 @@ void Worker::Exec()
m_captureTime = welcome.epoch;
m_executableTime = welcome.exectime;
m_ignoreMemFreeFaults = ( welcome.flags & WelcomeFlag::OnDemand ) || ( welcome.flags & WelcomeFlag::IgnoreMemFaults );
m_ignoreMemAllocFaults = welcome.flags & WelcomeFlag::IgnoreMemFaults;
m_ignoreFrameEndFaults = welcome.flags & WelcomeFlag::OnDemand;
m_data.cpuArch = (CpuArchitecture)welcome.cpuArch;
m_codeTransfer = welcome.flags & WelcomeFlag::CodeTransfer;
@@ -6294,16 +6295,25 @@ static MemEvent* MemDataFree( MemData& memdata, unordered_flat_map<uint64_t, siz
MemEvent* Worker::ProcessMemAllocImpl( MemData& memdata, const QueueMemAlloc& ev )
{
if( memdata.active.find( ev.ptr ) != memdata.active.end() )
{
MemAllocTwiceFailure( ev.thread );
return nullptr;
}
const auto time = TscTime( RefTime( m_refTimeSerial, ev.time ) );
if( m_data.lastTime < time ) m_data.lastTime = time;
NoticeThread( ev.thread );
const auto thread = CompressThread( ev.thread );
auto it = memdata.active.find( ev.ptr );
if( it != memdata.active.end() )
{
if( !m_ignoreMemAllocFaults )
{
MemAllocTwiceFailure( ev.thread );
return nullptr;
}
MemDataFree( memdata, it, time, thread );
MemAllocChanged( memdata, time );
}
assert( memdata.data.empty() || memdata.data.back().TimeAlloc() <= time );
memdata.active.emplace( ev.ptr, memdata.data.size() );
@@ -6318,7 +6328,7 @@ MemEvent* Worker::ProcessMemAllocImpl( MemData& memdata, const QueueMemAlloc& ev
auto& mem = memdata.data.push_next();
mem.SetPtr( ptr );
mem.SetSize( size );
mem.SetTimeThreadAlloc( time, CompressThread( ev.thread ) );
mem.SetTimeThreadAlloc( time, thread );
mem.SetTimeThreadFree( -1, 0 );
mem.SetCsAlloc( 0 );
mem.csFree.SetVal( 0 );