mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-05-01 13:13:53 +00:00
Code Issues Releases Wiki Activity

Worker thread will take care of itself.

Browse Source
This commit is contained in:
Bartosz Szreder 2018-02-15 13:19:20 +01:00
parent 9e3f18a62a
commit bae1c02ad0
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/TracyView.cpp
View File

@ -179,10 +179,6 @@ View::View( FileRead& f )
View::~View() View::~View()
{ {
m_worker.Shutdown(); m_worker.Shutdown();
if( !m_staticView )
{
m_worker.Join();
}
assert( s_instance != nullptr ); assert( s_instance != nullptr );
s_instance = nullptr; s_instance = nullptr;

9
server/TracyWorker.cpp
View File

@ -225,16 +225,13 @@ Worker::Worker( FileRead& f )
Worker::~Worker() Worker::~Worker()
{ {
delete [] m_buffer; Shutdown();
LZ4_freeStreamDecode( m_stream );
}
void Worker::Join()
{
if ( m_thread.joinable() ) if ( m_thread.joinable() )
{ {
m_thread.join(); m_thread.join();
} }
delete [] m_buffer;
LZ4_freeStreamDecode( m_stream );
} }
int64_t Worker::GetFrameTime( size_t idx ) const int64_t Worker::GetFrameTime( size_t idx ) const

1
server/TracyWorker.hpp
View File

@ -109,7 +109,6 @@ public:
bool IsConnected() const { return m_connected.load( std::memory_order_relaxed ); } bool IsConnected() const { return m_connected.load( std::memory_order_relaxed ); }
void Shutdown() { m_shutdown.store( true, std::memory_order_relaxed ); } void Shutdown() { m_shutdown.store( true, std::memory_order_relaxed ); }
void Join();
void Write( FileWrite& f ); void Write( FileWrite& f );
private: private: