mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 02:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove LZ4 include from TracyWorker.hpp.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-11-06 01:25:38 +01:00
parent 5d3392428e
commit f53637891a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/TracyWorker.cpp
View File

@ -1838,7 +1838,7 @@ Worker::~Worker()
if( m_threadBackground.joinable() ) m_threadBackground.join(); if( m_threadBackground.joinable() ) m_threadBackground.join();
delete[] m_buffer; delete[] m_buffer;
LZ4_freeStreamDecode( m_stream ); LZ4_freeStreamDecode( (LZ4_streamDecode_t*)m_stream );
delete[] m_frameImageBuffer; delete[] m_frameImageBuffer;
@ -2389,7 +2389,7 @@ void Worker::Network()
if( !m_sock.Read( lz4buf.get(), lz4sz, 10, ShouldExit ) ) goto close; if( !m_sock.Read( lz4buf.get(), lz4sz, 10, ShouldExit ) ) goto close;
m_bytes.fetch_add( sizeof( lz4sz ) + lz4sz, std::memory_order_relaxed ); m_bytes.fetch_add( sizeof( lz4sz ) + lz4sz, std::memory_order_relaxed );
auto sz = LZ4_decompress_safe_continue( m_stream, lz4buf.get(), buf, lz4sz, TargetFrameSize ); auto sz = LZ4_decompress_safe_continue( (LZ4_streamDecode_t*)m_stream, lz4buf.get(), buf, lz4sz, TargetFrameSize );
assert( sz >= 0 ); assert( sz >= 0 );
m_decBytes.fetch_add( sz, std::memory_order_relaxed ); m_decBytes.fetch_add( sz, std::memory_order_relaxed );
@ -2499,7 +2499,7 @@ void Worker::Exec()
m_serverQuerySpaceLeft = ( m_sock.GetSendBufSize() / ServerQueryPacketSize ) - ServerQueryPacketSize; // leave space for terminate request m_serverQuerySpaceLeft = ( m_sock.GetSendBufSize() / ServerQueryPacketSize ) - ServerQueryPacketSize; // leave space for terminate request
m_hasData.store( true, std::memory_order_release ); m_hasData.store( true, std::memory_order_release );
LZ4_setStreamDecode( m_stream, nullptr, 0 ); LZ4_setStreamDecode( (LZ4_streamDecode_t*)m_stream, nullptr, 0 );
m_connected.store( true, std::memory_order_relaxed ); m_connected.store( true, std::memory_order_relaxed );
{ {
std::lock_guard<std::mutex> lock( m_netWriteLock ); std::lock_guard<std::mutex> lock( m_netWriteLock );

3
server/TracyWorker.hpp
View File

@ -12,7 +12,6 @@
#include <thread> #include <thread>
#include <vector> #include <vector>
#include "../common/tracy_lz4.hpp"
#include "../common/TracyForceInline.hpp" #include "../common/TracyForceInline.hpp"
#include "../common/TracyQueue.hpp" #include "../common/TracyQueue.hpp"
#include "../common/TracyProtocol.hpp" #include "../common/TracyProtocol.hpp"
@ -610,7 +609,7 @@ private:
bool m_terminate = false; bool m_terminate = false;
bool m_crashed = false; bool m_crashed = false;
bool m_disconnect = false; bool m_disconnect = false;
LZ4_streamDecode_t* m_stream; void* m_stream; // LZ4_streamDecode_t*
char* m_buffer; char* m_buffer;
int m_bufferOffset; int m_bufferOffset;
bool m_onDemand; bool m_onDemand;