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

Remove one level of indirection in FileRead.

Browse Source
This commit is contained in:
Bartosz Taudul 2018-04-30 02:26:15 +02:00
parent c3efe228ce
commit fd46651c32
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/TracyFileRead.hpp
View File

@ -55,12 +55,12 @@ public:
{ {
if( m_offset == BufSize ) if( m_offset == BufSize )
{ {
m_active = 1 - m_active; std::swap( m_buf, m_second );
m_offset = 0; m_offset = 0;
uint32_t sz; uint32_t sz;
fread( &sz, 1, sizeof( sz ), m_file ); fread( &sz, 1, sizeof( sz ), m_file );
fread( m_lz4buf, 1, sz, m_file ); fread( m_lz4buf, 1, sz, m_file );
m_lastBlock = LZ4_decompress_safe_continue( m_stream, m_lz4buf, m_buf[m_active], sz, BufSize ); m_lastBlock = LZ4_decompress_safe_continue( m_stream, m_lz4buf, m_buf, sz, BufSize );
} }
const auto sz = std::min( size, BufSize - m_offset ); const auto sz = std::min( size, BufSize - m_offset );
@ -85,8 +85,9 @@ private:
FileRead( FILE* f ) FileRead( FILE* f )
: m_stream( LZ4_createStreamDecode() ) : m_stream( LZ4_createStreamDecode() )
, m_file( f ) , m_file( f )
, m_buf( m_bufData[0] )
, m_second( m_bufData[1] )
, m_offset( BufSize ) , m_offset( BufSize )
, m_active( 1 )
, m_lastBlock( 0 ) , m_lastBlock( 0 )
{ {
char hdr[4]; char hdr[4];
@ -103,7 +104,7 @@ private:
tracy_force_inline void ReadSmall( void* ptr, size_t size ) tracy_force_inline void ReadSmall( void* ptr, size_t size )
{ {
memcpy( ptr, m_buf[m_active] + m_offset, size ); memcpy( ptr, m_buf + m_offset, size );
m_offset += size; m_offset += size;
} }
@ -115,16 +116,16 @@ private:
{ {
if( m_offset == BufSize ) if( m_offset == BufSize )
{ {
m_active = 1 - m_active; std::swap( m_buf, m_second );
m_offset = 0; m_offset = 0;
uint32_t sz; uint32_t sz;
fread( &sz, 1, sizeof( sz ), m_file ); fread( &sz, 1, sizeof( sz ), m_file );
fread( m_lz4buf, 1, sz, m_file ); fread( m_lz4buf, 1, sz, m_file );
m_lastBlock = LZ4_decompress_safe_continue( m_stream, m_lz4buf, m_buf[m_active], sz, BufSize ); m_lastBlock = LZ4_decompress_safe_continue( m_stream, m_lz4buf, m_buf, sz, BufSize );
} }
const auto sz = std::min( size, BufSize - m_offset ); const auto sz = std::min( size, BufSize - m_offset );
memcpy( dst, m_buf[m_active] + m_offset, sz ); memcpy( dst, m_buf + m_offset, sz );
m_offset += sz; m_offset += sz;
dst += sz; dst += sz;
size -= sz; size -= sz;
@ -136,9 +137,10 @@ private:
LZ4_streamDecode_t* m_stream; LZ4_streamDecode_t* m_stream;
FILE* m_file; FILE* m_file;
char m_buf[2][BufSize]; char m_bufData[2][BufSize];
char* m_buf;
char* m_second;
size_t m_offset; size_t m_offset;
uint8_t m_active;
int m_lastBlock; int m_lastBlock;
}; };