Link/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Save thread state should be atomic.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-06-02 13:15:55 +02:00
parent 0059cb3ab0
commit 3a561b4eed
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/TracyView.cpp
View File

@ -693,10 +693,10 @@ bool View::DrawImpl()
return !wasCancelled; return !wasCancelled;
} }
if( m_saveThreadState == SaveThreadState::NeedsJoin ) if( m_saveThreadState.load( std::memory_order_relaxed ) == SaveThreadState::NeedsJoin )
{ {
m_saveThread.join(); m_saveThread.join();
m_saveThreadState = SaveThreadState::Inert; m_saveThreadState.store( SaveThreadState::Inert, std::memory_order_relaxed );
} }
const auto& io = ImGui::GetIO(); const auto& io = ImGui::GetIO();
@ -910,7 +910,7 @@ bool View::DrawImpl()
#else #else
ImGui::Text( "View span: %-10s Time span: %-10s ", TimeToString( m_zvEnd - m_zvStart ), TimeToString( m_worker.GetLastTime() - m_worker.GetTimeBegin() ) ); ImGui::Text( "View span: %-10s Time span: %-10s ", TimeToString( m_zvEnd - m_zvStart ), TimeToString( m_worker.GetLastTime() - m_worker.GetTimeBegin() ) );
#endif #endif
if( m_saveThreadState == SaveThreadState::Saving ) if( m_saveThreadState.load( std::memory_order_relaxed ) == SaveThreadState::Saving )
{ {
ImGui::SameLine(); ImGui::SameLine();
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
@ -1023,9 +1023,9 @@ bool View::DrawConnection()
} }
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
if( ImGui::Button( ICON_FA_SAVE " Save trace" ) && m_saveThreadState == SaveThreadState::Inert ) if( ImGui::Button( ICON_FA_SAVE " Save trace" ) && m_saveThreadState.load( std::memory_order_relaxed ) == SaveThreadState::Inert )
#else #else
if( ImGui::Button( "Save trace" ) && m_saveThreadState == SaveThreadState::Inert ) if( ImGui::Button( "Save trace" ) && m_saveThreadState.load( std::memory_order_relaxed ) == SaveThreadState::Inert )
#endif #endif
{ {
#ifdef TRACY_FILESELECTOR #ifdef TRACY_FILESELECTOR
@ -1050,11 +1050,11 @@ bool View::DrawConnection()
} }
if( f ) if( f )
{ {
m_saveThreadState = SaveThreadState::Saving; m_saveThreadState.store( SaveThreadState::Saving, std::memory_order_relaxed );
m_saveThread = std::thread( [this, f{std::move( f )}] { m_saveThread = std::thread( [this, f{std::move( f )}] {
std::shared_lock<std::shared_mutex> lock( m_worker.GetDataLock() ); std::shared_lock<std::shared_mutex> lock( m_worker.GetDataLock() );
m_worker.Write( *f ); m_worker.Write( *f );
m_saveThreadState = SaveThreadState::NeedsJoin; m_saveThreadState.store( SaveThreadState::NeedsJoin, std::memory_order_relaxed );
} ); } );
} }
} }

2
server/TracyView.hpp
View File

@ -323,7 +323,7 @@ private:
NeedsJoin NeedsJoin
}; };
SaveThreadState m_saveThreadState = SaveThreadState::Inert; std::atomic<SaveThreadState> m_saveThreadState { SaveThreadState::Inert };
std::thread m_saveThread; std::thread m_saveThread;
struct FindZone { struct FindZone {