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

Move saving trace dump to a separate thread.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-05-28 19:56:18 +02:00
parent 845f3a2ddf
commit c93170cd42
2 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
server/TracyView.cpp
View File

@ -459,6 +459,7 @@ View::~View()
m_worker.Shutdown(); m_worker.Shutdown();
if( m_compare.loadThread.joinable() ) m_compare.loadThread.join(); if( m_compare.loadThread.joinable() ) m_compare.loadThread.join();
if( m_saveThread.joinable() ) m_saveThread.join();
assert( s_instance != nullptr ); assert( s_instance != nullptr );
s_instance = nullptr; s_instance = nullptr;
@ -692,6 +693,12 @@ bool View::DrawImpl()
return !wasCancelled; return !wasCancelled;
} }
if( m_saveThreadState == SaveThreadState::NeedsJoin )
{
m_saveThread.join();
m_saveThreadState = SaveThreadState::Inert;
}
const auto& io = ImGui::GetIO(); const auto& io = ImGui::GetIO();
assert( m_shortcut == ShortcutAction::None ); assert( m_shortcut == ShortcutAction::None );
@ -756,7 +763,7 @@ bool View::DrawImpl()
ImGui::Begin( tmp, keepOpenPtr, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoBringToFrontOnFocus ); ImGui::Begin( tmp, keepOpenPtr, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoBringToFrontOnFocus );
#endif #endif
std::lock_guard<std::shared_mutex> lock( m_worker.GetDataLock() ); std::shared_lock<std::shared_mutex> lock( m_worker.GetDataLock() );
if( !m_worker.IsDataStatic() ) if( !m_worker.IsDataStatic() )
{ {
if( m_worker.IsConnected() ) if( m_worker.IsConnected() )
@ -903,7 +910,17 @@ 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_notificationTime > 0 ) if( m_saveThreadState == SaveThreadState::Saving )
{
ImGui::SameLine();
#ifdef TRACY_EXTENDED_FONT
ImGui::TextUnformatted( ICON_FA_SAVE " Saving trace..." );
#else
ImGui::TextUnformatted( "Saving trace..." );
#endif
m_notificationTime = 0;
}
else if( m_notificationTime > 0 )
{ {
m_notificationTime -= io.DeltaTime; m_notificationTime -= io.DeltaTime;
ImGui::SameLine(); ImGui::SameLine();
@ -966,7 +983,7 @@ bool View::DrawConnection()
const auto cs = ty * 0.9f; const auto cs = ty * 0.9f;
{ {
std::lock_guard<std::shared_mutex> lock( m_worker.GetMbpsDataLock() ); std::shared_lock<std::shared_mutex> lock( m_worker.GetMbpsDataLock() );
char tmp[2048]; char tmp[2048];
sprintf( tmp, "%s###Connection", m_worker.GetAddr().c_str() ); sprintf( tmp, "%s###Connection", m_worker.GetAddr().c_str() );
ImGui::Begin( tmp, nullptr, ImGuiWindowFlags_AlwaysAutoResize ); ImGui::Begin( tmp, nullptr, ImGuiWindowFlags_AlwaysAutoResize );
@ -993,7 +1010,7 @@ bool View::DrawConnection()
const auto wpos = ImGui::GetWindowPos() + ImGui::GetWindowContentRegionMin(); const auto wpos = ImGui::GetWindowPos() + ImGui::GetWindowContentRegionMin();
ImGui::GetWindowDrawList()->AddCircleFilled( wpos + ImVec2( 1 + cs * 0.5, 3 + ty * 0.5 ), cs * 0.5, m_worker.IsConnected() ? 0xFF2222CC : 0xFF444444, 10 ); ImGui::GetWindowDrawList()->AddCircleFilled( wpos + ImVec2( 1 + cs * 0.5, 3 + ty * 0.5 ), cs * 0.5, m_worker.IsConnected() ? 0xFF2222CC : 0xFF444444, 10 );
std::lock_guard<std::shared_mutex> lock( m_worker.GetDataLock() ); std::shared_lock<std::shared_mutex> lock( m_worker.GetDataLock() );
{ {
const auto sz = m_worker.GetFrameCount( *m_frames ); const auto sz = m_worker.GetFrameCount( *m_frames );
if( sz > 1 ) if( sz > 1 )
@ -1006,9 +1023,9 @@ bool View::DrawConnection()
} }
#ifdef TRACY_EXTENDED_FONT #ifdef TRACY_EXTENDED_FONT
if( ImGui::Button( ICON_FA_SAVE " Save trace" ) ) if( ImGui::Button( ICON_FA_SAVE " Save trace" ) && m_saveThreadState == SaveThreadState::Inert )
#else #else
if( ImGui::Button( "Save trace" ) ) if( ImGui::Button( "Save trace" ) && m_saveThreadState == SaveThreadState::Inert )
#endif #endif
{ {
#ifdef TRACY_FILESELECTOR #ifdef TRACY_FILESELECTOR
@ -1033,7 +1050,12 @@ bool View::DrawConnection()
} }
if( f ) if( f )
{ {
m_worker.Write( *f ); m_saveThreadState = SaveThreadState::Saving;
m_saveThread = std::thread( [this, f{std::move( f )}] {
std::shared_lock<std::shared_mutex> lock( m_worker.GetDataLock() );
m_worker.Write( *f );
m_saveThreadState = SaveThreadState::NeedsJoin;
} );
} }
} }
} }

10
server/TracyView.hpp
View File

@ -316,6 +316,16 @@ private:
bool m_activeOnlyBottomUp = false; bool m_activeOnlyBottomUp = false;
bool m_activeOnlyTopDown = false; bool m_activeOnlyTopDown = false;
enum class SaveThreadState
{
Inert,
Saving,
NeedsJoin
};
SaveThreadState m_saveThreadState = SaveThreadState::Inert;
std::thread m_saveThread;
struct FindZone { struct FindZone {
enum : uint64_t { Unselected = std::numeric_limits<uint64_t>::max() - 1 }; enum : uint64_t { Unselected = std::numeric_limits<uint64_t>::max() - 1 };
enum class GroupBy : int { Thread, UserText, Callstack }; enum class GroupBy : int { Thread, UserText, Callstack };