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

Handle discontinuous frame end mismatch failure.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-02-28 19:32:42 +01:00
parent d80dc82b96
commit 42c94f7142
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/TracyWorker.cpp
View File

@ -2439,6 +2439,13 @@ void Worker::MemFreeFailure( uint64_t thread )
m_failureData.srcloc = 0;
}
void Worker::FrameEndFailure()
{
m_failure = Failure::ZoneEnd;
m_failureData.thread = 0;
m_failureData.srcloc = 0;
}
void Worker::ProcessZoneValidation( const QueueZoneValidation& ev )
{
auto td = NoticeThread( ev.thread );
@ -2496,7 +2503,7 @@ void Worker::ProcessFrameMarkEnd( const QueueFrameMark& ev )
const auto time = TscTime( ev.time );
if( fd->frames.empty() )
{
assert( m_onDemand );
FrameEndFailure();
return;
}
assert( fd->frames.back().end == -1 );
@ -3857,7 +3864,8 @@ static const char* s_failureReasons[] = {
"Received zone end event without a matching zone begin event.",
"Zone text transfer destination doesn't match active zone.",
"Zone name transfer destination doesn't match active zone.",
"Memory free event without a matching allocation."
"Memory free event without a matching allocation.",
"Discontinuous frame begin/end mismatch.",
};
static_assert( sizeof( s_failureReasons ) / sizeof( *s_failureReasons ) == (int)Worker::Failure::NUM_FAILURES, "Missing failure reason description." );

2
server/TracyWorker.hpp
View File

@ -189,6 +189,7 @@ public:
ZoneText,
ZoneName,
MemFree,
FrameEnd,
NUM_FAILURES
};
@ -350,6 +351,7 @@ private:
void ZoneTextFailure( uint64_t thread );
void ZoneNameFailure( uint64_t thread );
void MemFreeFailure( uint64_t thread );
void FrameEndFailure();
tracy_force_inline void CheckSourceLocation( uint64_t ptr );
void NewSourceLocation( uint64_t ptr );