1
0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00

Make DequeueStatus enum class.

This commit is contained in:
Bartosz Taudul 2019-06-09 16:14:30 +02:00
parent 34d89d39a1
commit 23e7850162
2 changed files with 13 additions and 13 deletions

View File

@ -1193,11 +1193,11 @@ void Profiler::Worker()
ProcessSysTime(); ProcessSysTime();
const auto status = Dequeue( token ); const auto status = Dequeue( token );
const auto serialStatus = DequeueSerial(); const auto serialStatus = DequeueSerial();
if( status == ConnectionLost || serialStatus == ConnectionLost ) if( status == DequeueStatus::ConnectionLost || serialStatus == DequeueStatus::ConnectionLost )
{ {
break; break;
} }
else if( status == QueueEmpty && serialStatus == QueueEmpty ) else if( status == DequeueStatus::QueueEmpty && serialStatus == DequeueStatus::QueueEmpty )
{ {
if( ShouldExit() ) break; if( ShouldExit() ) break;
if( m_bufferOffset != m_bufferStart ) if( m_bufferOffset != m_bufferStart )
@ -1289,11 +1289,11 @@ void Profiler::Worker()
{ {
const auto status = Dequeue( token ); const auto status = Dequeue( token );
const auto serialStatus = DequeueSerial(); const auto serialStatus = DequeueSerial();
if( status == ConnectionLost || serialStatus == ConnectionLost ) if( status == DequeueStatus::ConnectionLost || serialStatus == DequeueStatus::ConnectionLost )
{ {
break; break;
} }
else if( status == QueueEmpty && serialStatus == QueueEmpty ) else if( status == DequeueStatus::QueueEmpty && serialStatus == DequeueStatus::QueueEmpty )
{ {
if( m_bufferOffset != m_bufferStart ) CommitData(); if( m_bufferOffset != m_bufferStart ) CommitData();
break; break;
@ -1327,8 +1327,8 @@ void Profiler::Worker()
return; return;
} }
} }
while( Dequeue( token ) == Success ) {} while( Dequeue( token ) == DequeueStatus::Success ) {}
while( DequeueSerial() == Success ) {} while( DequeueSerial() == DequeueStatus::Success ) {}
if( m_bufferOffset != m_bufferStart ) if( m_bufferOffset != m_bufferStart )
{ {
if( !CommitData() ) if( !CommitData() )
@ -1491,15 +1491,15 @@ Profiler::DequeueStatus Profiler::Dequeue( moodycamel::ConsumerToken& token )
break; break;
} }
} }
if( !AppendData( item, QueueDataSize[idx] ) ) return ConnectionLost; if( !AppendData( item, QueueDataSize[idx] ) ) return DequeueStatus::ConnectionLost;
item++; item++;
} }
} }
else else
{ {
return QueueEmpty; return DequeueStatus::QueueEmpty;
} }
return Success; return DequeueStatus::Success;
} }
Profiler::DequeueStatus Profiler::DequeueSerial() Profiler::DequeueStatus Profiler::DequeueSerial()
@ -1544,16 +1544,16 @@ Profiler::DequeueStatus Profiler::DequeueSerial()
break; break;
} }
} }
if( !AppendData( item, QueueDataSize[idx] ) ) return ConnectionLost; if( !AppendData( item, QueueDataSize[idx] ) ) return DequeueStatus::ConnectionLost;
item++; item++;
} }
m_serialDequeue.clear(); m_serialDequeue.clear();
} }
else else
{ {
return QueueEmpty; return DequeueStatus::QueueEmpty;
} }
return Success; return DequeueStatus::Success;
} }
bool Profiler::AppendData( const void* data, size_t len ) bool Profiler::AppendData( const void* data, size_t len )

View File

@ -423,7 +423,7 @@ public:
bool HasShutdownFinished() const { return m_shutdownFinished.load( std::memory_order_relaxed ); } bool HasShutdownFinished() const { return m_shutdownFinished.load( std::memory_order_relaxed ); }
private: private:
enum DequeueStatus { Success, ConnectionLost, QueueEmpty }; enum class DequeueStatus { Success, ConnectionLost, QueueEmpty };
static void LaunchWorker( void* ptr ) { ((Profiler*)ptr)->Worker(); } static void LaunchWorker( void* ptr ) { ((Profiler*)ptr)->Worker(); }
void Worker(); void Worker();