mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 02:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store failure reason strings in Worker.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-01-15 18:42:15 +01:00
parent 3cd97138fc
commit 9944a73444
4 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
capture/src/capture.cpp
View File

@ -182,17 +182,7 @@ int main( int argc, char** argv )
const auto& failure = worker.GetFailureType();
if( failure != tracy::Worker::Failure::None )
{
printf( "\n\033[31;1mInstrumentation failure: " );
switch( failure )
{
case tracy::Worker::Failure::ZoneStack:
printf( "Invalid order of zone begin and end events." );
break;
default:
printf( "<unknown reason>" );
break;
}
printf( "\033[0m" );
printf( "\n\033[31;1mInstrumentation failure: %s\033[0m", tracy::Worker::GetFailureString( failure ) );
}
printf( "\nFrames: %" PRIu64 "\nTime span: %s\nZones: %s\nSaving trace...", worker.GetFrameCount( *worker.GetFramesBase() ), TimeToString( worker.GetLastTime() - worker.GetTimeBegin() ), RealToString( worker.GetZoneCount(), true ) );

10
server/TracyView.cpp
View File

@ -469,15 +469,7 @@ bool View::Draw()
ImGui::Text( "Profiling session terminated due to improper instrumentation.\nPlease correct your program and try again." );
ImGui::Text( "Reason:" );
ImGui::SameLine();
switch( failure )
{
case Worker::Failure::ZoneStack:
ImGui::Text( "Invalid order of zone begin and end events." );
break;
default:
assert( false );
break;
}
ImGui::Text( "%s", Worker::GetFailureString( failure ) );
ImGui::Separator();
if( srcloc.name.active )
{

10
server/TracyWorker.cpp
View File

@ -3645,4 +3645,14 @@ void Worker::WriteTimeline( FileWrite& f, const Vector<GpuEvent*>& vec, int64_t&
}
}
static const char* s_failureReasons[] = {
"<unknown reason>",
"Invalid order of zone begin and end events."
};
const char* Worker::GetFailureString( Worker::Failure failure )
{
return s_failureReasons[(int)failure];
}
}

5
server/TracyWorker.hpp
View File

@ -180,7 +180,9 @@ public:
enum class Failure
{
None,
ZoneStack
ZoneStack,
NUM_FAILURES
};
Worker( const char* addr );
@ -284,6 +286,7 @@ public:
void ClearFailure() { m_failure = Failure::None; }
Failure GetFailureType() const { return m_failure; }
const FailureData& GetFailureData() const { return m_failureData; }
static const char* GetFailureString( Failure failure );
private:
void Exec();