mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-29 12:23:53 +00:00
Code Issues Releases Wiki Activity

Fix conflicts with X.h.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-11-14 18:24:29 +01:00
parent 9cf46e6ae6
commit 0befc75f83
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/TracyProfiler.cpp
View File

@ -1497,8 +1497,8 @@ void Profiler::Worker()
return; return;
} }
} }
while( Dequeue( token ) == DequeueStatus::Success ) {} while( Dequeue( token ) == DequeueStatus::DataDequeued ) {}
while( DequeueSerial() == DequeueStatus::Success ) {} while( DequeueSerial() == DequeueStatus::DataDequeued ) {}
if( m_bufferOffset != m_bufferStart ) if( m_bufferOffset != m_bufferStart )
{ {
if( !CommitData() ) if( !CommitData() )
@ -1832,7 +1832,7 @@ Profiler::DequeueStatus Profiler::Dequeue( moodycamel::ConsumerToken& token )
{ {
return DequeueStatus::QueueEmpty; return DequeueStatus::QueueEmpty;
} }
return DequeueStatus::Success; return DequeueStatus::DataDequeued;
} }
Profiler::DequeueStatus Profiler::DequeueContextSwitches( tracy::moodycamel::ConsumerToken& token, int64_t& timeStop ) Profiler::DequeueStatus Profiler::DequeueContextSwitches( tracy::moodycamel::ConsumerToken& token, int64_t& timeStop )
@ -1852,7 +1852,7 @@ Profiler::DequeueStatus Profiler::DequeueContextSwitches( tracy::moodycamel::Con
if( csTime > timeStop ) if( csTime > timeStop )
{ {
timeStop = -1; timeStop = -1;
return DequeueStatus::Success; return DequeueStatus::DataDequeued;
} }
int64_t dt = csTime - m_refTimeCtx; int64_t dt = csTime - m_refTimeCtx;
m_refTimeCtx = csTime; m_refTimeCtx = csTime;
@ -1865,7 +1865,7 @@ Profiler::DequeueStatus Profiler::DequeueContextSwitches( tracy::moodycamel::Con
if( csTime > timeStop ) if( csTime > timeStop )
{ {
timeStop = -1; timeStop = -1;
return DequeueStatus::Success; return DequeueStatus::DataDequeued;
} }
int64_t dt = csTime - m_refTimeCtx; int64_t dt = csTime - m_refTimeCtx;
m_refTimeCtx = csTime; m_refTimeCtx = csTime;
@ -1879,7 +1879,7 @@ Profiler::DequeueStatus Profiler::DequeueContextSwitches( tracy::moodycamel::Con
{ {
return DequeueStatus::QueueEmpty; return DequeueStatus::QueueEmpty;
} }
return DequeueStatus::Success; return DequeueStatus::DataDequeued;
} }
Profiler::DequeueStatus Profiler::DequeueSerial() Profiler::DequeueStatus Profiler::DequeueSerial()
@ -2003,7 +2003,7 @@ Profiler::DequeueStatus Profiler::DequeueSerial()
{ {
return DequeueStatus::QueueEmpty; return DequeueStatus::QueueEmpty;
} }
return DequeueStatus::Success; return DequeueStatus::DataDequeued;
} }
bool Profiler::AppendData( const void* data, size_t len ) bool Profiler::AppendData( const void* data, size_t len )

2
client/TracyProfiler.hpp
View File

@ -465,7 +465,7 @@ public:
void SendString( uint64_t ptr, const char* str, QueueType type ); void SendString( uint64_t ptr, const char* str, QueueType type );
private: private:
enum class DequeueStatus { Success, ConnectionLost, QueueEmpty }; enum class DequeueStatus { DataDequeued, ConnectionLost, QueueEmpty };
static void LaunchWorker( void* ptr ) { ((Profiler*)ptr)->Worker(); } static void LaunchWorker( void* ptr ) { ((Profiler*)ptr)->Worker(); }
void Worker(); void Worker();