mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-05-03 14:03:52 +00:00
Code Issues Releases Wiki Activity

Handle frame image instrumentation failures.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-06-09 13:44:53 +02:00
parent 5d5b12dce4
commit 50cda7720f
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
server/TracyWorker.cpp
View File

@ -2887,6 +2887,20 @@ void Worker::FrameEndFailure()
m_failureData.srcloc = 0; m_failureData.srcloc = 0;
} }
void Worker::FrameImageIndexFailure()
{
m_failure = Failure::FrameImageIndex;
m_failureData.thread = 0;
m_failureData.srcloc = 0;
}
void Worker::FrameImageTwiceFailure()
{
m_failure = Failure::FrameImageTwice;
m_failureData.thread = 0;
m_failureData.srcloc = 0;
}
void Worker::ProcessZoneValidation( const QueueZoneValidation& ev ) void Worker::ProcessZoneValidation( const QueueZoneValidation& ev )
{ {
auto td = NoticeThread( ev.thread ); auto td = NoticeThread( ev.thread );
@ -2957,6 +2971,19 @@ void Worker::ProcessFrameImage( const QueueFrameImage& ev )
auto it = m_pendingFrameImageData.find( ev.image ); auto it = m_pendingFrameImageData.find( ev.image );
assert( it != m_pendingFrameImageData.end() ); assert( it != m_pendingFrameImageData.end() );
auto& frames = m_data.framesBase->frames;
const auto fidx = (int64_t)frames.size() - 1 - ev.offset;
if( fidx <= 0 )
{
FrameImageIndexFailure();
return;
}
if( frames[fidx].frameImage >= 0 )
{
FrameImageTwiceFailure();
return;
}
auto fi = m_slab.Alloc<FrameImage>(); auto fi = m_slab.Alloc<FrameImage>();
fi->ptr = PackFrameImage( (const char*)it->second, ev.w, ev.h, fi->csz ); fi->ptr = PackFrameImage( (const char*)it->second, ev.w, ev.h, fi->csz );
fi->w = ev.w; fi->w = ev.w;
@ -2964,11 +2991,6 @@ void Worker::ProcessFrameImage( const QueueFrameImage& ev )
const auto idx = m_data.frameImage.size(); const auto idx = m_data.frameImage.size();
m_data.frameImage.push_back( fi ); m_data.frameImage.push_back( fi );
auto& frames = m_data.framesBase->frames;
const auto fidx = (int64_t)frames.size() - 1 - ev.offset;
assert( fidx >= 0 );
assert( frames[fidx].frameImage == -1 );
frames[fidx].frameImage = idx; frames[fidx].frameImage = idx;
m_pendingFrameImageData.erase( it ); m_pendingFrameImageData.erase( it );
@ -4411,6 +4433,8 @@ static const char* s_failureReasons[] = {
"Zone name 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.", "Discontinuous frame begin/end mismatch.",
"Frame image offset is invalid.",
"Multiple frame images were sent for a single frame.",
}; };
static_assert( sizeof( s_failureReasons ) / sizeof( *s_failureReasons ) == (int)Worker::Failure::NUM_FAILURES, "Missing failure reason description." ); static_assert( sizeof( s_failureReasons ) / sizeof( *s_failureReasons ) == (int)Worker::Failure::NUM_FAILURES, "Missing failure reason description." );

4
server/TracyWorker.hpp
View File

@ -231,6 +231,8 @@ public:
ZoneName, ZoneName,
MemFree, MemFree,
FrameEnd, FrameEnd,
FrameImageIndex,
FrameImageTwice,
NUM_FAILURES NUM_FAILURES
}; };
@ -407,6 +409,8 @@ private:
void ZoneNameFailure( uint64_t thread ); void ZoneNameFailure( uint64_t thread );
void MemFreeFailure( uint64_t thread ); void MemFreeFailure( uint64_t thread );
void FrameEndFailure(); void FrameEndFailure();
void FrameImageIndexFailure();
void FrameImageTwiceFailure();
tracy_force_inline void CheckSourceLocation( uint64_t ptr ); tracy_force_inline void CheckSourceLocation( uint64_t ptr );
void NewSourceLocation( uint64_t ptr ); void NewSourceLocation( uint64_t ptr );