zhangengru/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Filename in callstack frame is not a persistent pointer.

Browse Source
This commit is contained in:
Bartosz Taudul
2018-06-20 01:26:05 +02:00
parent 56479b86fa
commit 88b1955a5a
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/TracyWorker.cpp
+8 -5
View File
@@ -2116,8 +2116,10 @@ void Worker::ProcessCallstackMemory( const QueueCallstackMemory& ev )
void Worker::ProcessCallstackFrame( const QueueCallstackFrame& ev )
{
auto fmit = m_data.callstackFrameMap.find( ev.ptr );
auto it = m_pendingCustomStrings.find( ev.name );
assert( it != m_pendingCustomStrings.end() );
auto nit = m_pendingCustomStrings.find( ev.name );
assert( nit != m_pendingCustomStrings.end() );
auto fit = m_pendingCustomStrings.find( ev.file );
assert( fit != m_pendingCustomStrings.end() );
// Frames may be duplicated due to recursion
if( fmit == m_data.callstackFrameMap.end() )
@@ -2125,14 +2127,15 @@ void Worker::ProcessCallstackFrame( const QueueCallstackFrame& ev )
CheckString( ev.file );
auto frame = m_slab.Alloc<CallstackFrame>();
frame->name = StringIdx( it->second.idx );
frame->file = ev.file;
frame->name = StringIdx( nit->second.idx );
frame->file = StringIdx( fit->second.idx );
frame->line = ev.line;
m_data.callstackFrameMap.emplace( ev.ptr, frame );
}
m_pendingCustomStrings.erase( it );
m_pendingCustomStrings.erase( nit );
m_pendingCustomStrings.erase( m_pendingCustomStrings.find( ev.file ) );
}
void Worker::MemAllocChanged( int64_t time )