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

Preserve symbol call location.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-02-27 14:35:00 +01:00
parent 2e5ce52086
commit 7dd929a39e
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/TracyEvent.hpp
View File

@ -329,6 +329,8 @@ struct CallstackFrame : public CallstackFrameBasic
struct SymbolData : public CallstackFrameBasic struct SymbolData : public CallstackFrameBasic
{ {
StringIdx imageName; StringIdx imageName;
StringIdx callFile;
uint32_t callLine;
}; };
enum { CallstackFrameBasicSize = sizeof( CallstackFrameBasic ) }; enum { CallstackFrameBasicSize = sizeof( CallstackFrameBasic ) };

15
server/TracyWorker.cpp
View File

@ -1643,10 +1643,10 @@ Worker::Worker( FileRead& f, EventType::Type eventMask, bool bgTasks )
for( uint64_t i=0; i<sz; i++ ) for( uint64_t i=0; i<sz; i++ )
{ {
uint64_t symAddr; uint64_t symAddr;
StringIdx name, file, imageName; StringIdx name, file, imageName, callFile;
uint32_t line; uint32_t line, callLine;
f.Read5( symAddr, name, file, line, imageName ); f.Read7( symAddr, name, file, line, imageName, callFile, callLine );
m_data.symbolMap.emplace( symAddr, SymbolData { name, file, line, imageName } ); m_data.symbolMap.emplace( symAddr, SymbolData { name, file, line, imageName, callFile, callLine } );
} }
} }
@ -4819,14 +4819,15 @@ void Worker::ProcessCallstackFrame( const QueueCallstackFrame& ev )
const auto idx = m_callstackFrameStaging->size - m_pendingCallstackSubframes; const auto idx = m_callstackFrameStaging->size - m_pendingCallstackSubframes;
const auto name = StringIdx( nit->second.idx ); const auto name = StringIdx( nit->second.idx );
const auto file = StringIdx( fit->second.idx );
m_callstackFrameStaging->data[idx].name = name; m_callstackFrameStaging->data[idx].name = name;
m_callstackFrameStaging->data[idx].file = StringIdx( fit->second.idx ); m_callstackFrameStaging->data[idx].file = file;
m_callstackFrameStaging->data[idx].line = ev.line; m_callstackFrameStaging->data[idx].line = ev.line;
m_callstackFrameStaging->data[idx].symAddr = ev.symAddr; m_callstackFrameStaging->data[idx].symAddr = ev.symAddr;
if( ev.symAddr != 0 && m_data.symbolMap.find( ev.symAddr ) == m_data.symbolMap.end() && m_pendingSymbols.find( ev.symAddr ) == m_pendingSymbols.end() ) if( ev.symAddr != 0 && m_data.symbolMap.find( ev.symAddr ) == m_data.symbolMap.end() && m_pendingSymbols.find( ev.symAddr ) == m_pendingSymbols.end() )
{ {
m_pendingSymbols.emplace( ev.symAddr, SymbolPending { name, m_callstackFrameStaging->imageName } ); m_pendingSymbols.emplace( ev.symAddr, SymbolPending { name, m_callstackFrameStaging->imageName, file, ev.line } );
Query( ServerQuerySymbol, ev.symAddr ); Query( ServerQuerySymbol, ev.symAddr );
} }
@ -4859,6 +4860,8 @@ void Worker::ProcessSymbolInformation( const QueueSymbolInformation& ev )
sd.file = StringIdx( fit->second.idx ); sd.file = StringIdx( fit->second.idx );
sd.line = ev.line; sd.line = ev.line;
sd.imageName = it->second.imageName; sd.imageName = it->second.imageName;
sd.callFile = it->second.file;
sd.callLine = it->second.line;
m_data.symbolMap.emplace( ev.symAddr, std::move( sd ) ); m_data.symbolMap.emplace( ev.symAddr, std::move( sd ) );
m_pendingSymbols.erase( it ); m_pendingSymbols.erase( it );

2
server/TracyWorker.hpp
View File

@ -179,6 +179,8 @@ private:
{ {
StringIdx name; StringIdx name;
StringIdx imageName; StringIdx imageName;
StringIdx file;
uint32_t line;
}; };
struct DataBlock struct DataBlock