mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-26 16:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Have to track callstacks of both alloc and free.

Browse Source
This commit is contained in:
Bartosz Taudul 2018-06-19 22:08:47 +02:00
parent 0de279005b
commit 06f34052a5
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/TracyEvent.hpp
View File

@ -147,7 +147,8 @@ struct MemEvent
uint64_t size; uint64_t size;
int64_t timeAlloc; int64_t timeAlloc;
int64_t timeFree; int64_t timeFree;
uint32_t callstack; uint32_t csAlloc;
uint32_t csFree;
// All above is read/saved as-is. // All above is read/saved as-is.
uint16_t threadAlloc; uint16_t threadAlloc;

24
server/TracyWorker.cpp
View File

@ -553,11 +553,12 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
if( fileVer <= FileVersion( 0, 3, 1 ) ) if( fileVer <= FileVersion( 0, 3, 1 ) )
{ {
f.Read( mem, sizeof( MemEvent::ptr ) + sizeof( MemEvent::size ) + sizeof( MemEvent::timeAlloc ) + sizeof( MemEvent::timeFree ) ); f.Read( mem, sizeof( MemEvent::ptr ) + sizeof( MemEvent::size ) + sizeof( MemEvent::timeAlloc ) + sizeof( MemEvent::timeFree ) );
mem->callstack = 0; mem->csAlloc = 0;
mem->csFree = 0;
} }
else else
{ {
f.Read( mem, sizeof( MemEvent::ptr ) + sizeof( MemEvent::size ) + sizeof( MemEvent::timeAlloc ) + sizeof( MemEvent::timeFree ) + sizeof( MemEvent::callstack ) ); f.Read( mem, sizeof( MemEvent::ptr ) + sizeof( MemEvent::size ) + sizeof( MemEvent::timeAlloc ) + sizeof( MemEvent::timeFree ) + sizeof( MemEvent::csAlloc ) + sizeof( MemEvent::csFree ) );
} }
uint64_t t0, t1; uint64_t t0, t1;
@ -611,7 +612,8 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
sizeof( MemEvent::size ) + sizeof( MemEvent::size ) +
sizeof( MemEvent::timeAlloc ) + sizeof( MemEvent::timeAlloc ) +
sizeof( MemEvent::timeFree ) + sizeof( MemEvent::timeFree ) +
sizeof( MemEvent::callstack ) + sizeof( MemEvent::csAlloc ) +
sizeof( MemEvent::csFree ) +
sizeof( uint64_t ) + sizeof( uint64_t ) +
sizeof( uint64_t ) ) ); sizeof( uint64_t ) ) );
} }
@ -2024,7 +2026,8 @@ void Worker::ProcessMemAlloc( const QueueMemAlloc& ev )
mem.threadAlloc = CompressThread( ev.thread ); mem.threadAlloc = CompressThread( ev.thread );
mem.timeFree = -1; mem.timeFree = -1;
mem.threadFree = 0; mem.threadFree = 0;
mem.callstack = 0; mem.csAlloc = 0;
mem.csFree = 0;
const auto low = m_data.memory.low; const auto low = m_data.memory.low;
const auto high = m_data.memory.high; const auto high = m_data.memory.high;
@ -2057,12 +2060,14 @@ void Worker::ProcessMemAllocCallstack( const QueueMemAlloc& ev )
{ {
m_lastMemActionCallstack = m_data.memory.data.size(); m_lastMemActionCallstack = m_data.memory.data.size();
ProcessMemAlloc( ev ); ProcessMemAlloc( ev );
m_lastMemActionWasAlloc = true;
} }
void Worker::ProcessMemFreeCallstack( const QueueMemFree& ev ) void Worker::ProcessMemFreeCallstack( const QueueMemFree& ev )
{ {
ProcessMemFree( ev ); ProcessMemFree( ev );
m_lastMemActionCallstack = m_data.memory.frees.back(); m_lastMemActionCallstack = m_data.memory.frees.back();
m_lastMemActionWasAlloc = false;
} }
void Worker::ProcessCallstackMemory( const QueueCallstackMemory& ev ) void Worker::ProcessCallstackMemory( const QueueCallstackMemory& ev )
@ -2071,7 +2076,14 @@ void Worker::ProcessCallstackMemory( const QueueCallstackMemory& ev )
assert( it != m_pendingCallstacks.end() ); assert( it != m_pendingCallstacks.end() );
auto& mem = m_data.memory.data[m_lastMemActionCallstack]; auto& mem = m_data.memory.data[m_lastMemActionCallstack];
mem.callstack = it->second; if( m_lastMemActionWasAlloc )
{
mem.csAlloc = it->second;
}
else
{
mem.csFree = it->second;
}
m_pendingCallstacks.erase( it ); m_pendingCallstacks.erase( it );
} }
@ -2453,7 +2465,7 @@ void Worker::Write( FileWrite& f )
f.Write( &sz, sizeof( sz ) ); f.Write( &sz, sizeof( sz ) );
for( auto& mem : m_data.memory.data ) for( auto& mem : m_data.memory.data )
{ {
f.Write( &mem, sizeof( MemEvent::ptr ) + sizeof( MemEvent::size ) + sizeof( MemEvent::timeAlloc ) + sizeof( MemEvent::timeFree ) + sizeof( MemEvent::callstack ) ); f.Write( &mem, sizeof( MemEvent::ptr ) + sizeof( MemEvent::size ) + sizeof( MemEvent::timeAlloc ) + sizeof( MemEvent::timeFree ) + sizeof( MemEvent::csAlloc ) + sizeof( MemEvent::csFree ) );
uint64_t t[2]; uint64_t t[2];
t[0] = DecompressThread( mem.threadAlloc ); t[0] = DecompressThread( mem.threadAlloc );
t[1] = DecompressThread( mem.threadFree ); t[1] = DecompressThread( mem.threadFree );

1
server/TracyWorker.hpp
View File

@ -307,6 +307,7 @@ private:
uint32_t m_pendingSourceLocation; uint32_t m_pendingSourceLocation;
uint64_t m_lastMemActionCallstack; uint64_t m_lastMemActionCallstack;
bool m_lastMemActionWasAlloc;
Slab<64*1024*1024> m_slab; Slab<64*1024*1024> m_slab;