mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-29 04:23:51 +00:00
Code Issues Releases Wiki Activity

Add zstd compression to FileWrite.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-02-08 15:43:01 +01:00
parent 64cfad317d
commit 145514687c
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/TracyFileHeader.hpp
View File

@ -6,7 +6,8 @@
namespace tracy namespace tracy
{ {
static const char Lz4Header[4] = { 't', 'l', 'Z', 4 }; static const char Lz4Header[4] = { 't', 'l', 'Z', 4 };
static const char ZstdHeader[4] = { 't', 'Z', 's', 't' };
static constexpr tracy_force_inline int FileVersion( uint8_t h5, uint8_t h6, uint8_t h7 ) static constexpr tracy_force_inline int FileVersion( uint8_t h5, uint8_t h6, uint8_t h7 )
{ {

37
server/TracyFileWrite.hpp
View File

@ -15,6 +15,7 @@
#include "../common/tracy_lz4.hpp" #include "../common/tracy_lz4.hpp"
#include "../common/tracy_lz4hc.hpp" #include "../common/tracy_lz4hc.hpp"
#include "../common/TracyForceInline.hpp" #include "../common/TracyForceInline.hpp"
#include "../zstd/zstd.h"
namespace tracy namespace tracy
{ {
@ -26,13 +27,14 @@ public:
{ {
Fast, Fast,
Slow, Slow,
Extreme Extreme,
Zstd
}; };
static FileWrite* Open( const char* fn, Compression comp = Compression::Fast ) static FileWrite* Open( const char* fn, Compression comp = Compression::Fast, int level = 1 )
{ {
auto f = fopen( fn, "wb" ); auto f = fopen( fn, "wb" );
return f ? new FileWrite( f, comp ) : nullptr; return f ? new FileWrite( f, comp, level ) : nullptr;
} }
~FileWrite() ~FileWrite()
@ -42,6 +44,7 @@ public:
if( m_stream ) LZ4_freeStream( m_stream ); if( m_stream ) LZ4_freeStream( m_stream );
if( m_streamHC ) LZ4_freeStreamHC( m_streamHC ); if( m_streamHC ) LZ4_freeStreamHC( m_streamHC );
if( m_streamZstd ) ZSTD_freeCStream( m_streamZstd );
} }
void Finish() void Finish()
@ -64,9 +67,10 @@ public:
std::pair<size_t, size_t> GetCompressionStatistics() const { return std::make_pair( m_srcBytes, m_dstBytes ); } std::pair<size_t, size_t> GetCompressionStatistics() const { return std::make_pair( m_srcBytes, m_dstBytes ); }
private: private:
FileWrite( FILE* f, Compression comp ) FileWrite( FILE* f, Compression comp, int level )
: m_stream( nullptr ) : m_stream( nullptr )
, m_streamHC( nullptr ) , m_streamHC( nullptr )
, m_streamZstd( nullptr )
, m_file( f ) , m_file( f )
, m_buf( m_bufData[0] ) , m_buf( m_bufData[0] )
, m_second( m_bufData[1] ) , m_second( m_bufData[1] )
@ -86,12 +90,24 @@ private:
m_streamHC = LZ4_createStreamHC(); m_streamHC = LZ4_createStreamHC();
LZ4_resetStreamHC( m_streamHC, LZ4HC_CLEVEL_MAX ); LZ4_resetStreamHC( m_streamHC, LZ4HC_CLEVEL_MAX );
break; break;
case Compression::Zstd:
m_streamZstd = ZSTD_createCStream();
ZSTD_CCtx_setParameter( m_streamZstd, ZSTD_c_compressionLevel, level );
ZSTD_CCtx_setParameter( m_streamZstd, ZSTD_c_contentSizeFlag, 0 );
break;
default: default:
assert( false ); assert( false );
break; break;
} }
fwrite( Lz4Header, 1, sizeof( Lz4Header ), m_file ); if( comp == Compression::Zstd )
{
fwrite( ZstdHeader, 1, sizeof( ZstdHeader ), m_file );
}
else
{
fwrite( Lz4Header, 1, sizeof( Lz4Header ), m_file );
}
} }
tracy_force_inline void WriteSmall( const void* ptr, size_t size ) tracy_force_inline void WriteSmall( const void* ptr, size_t size )
@ -126,6 +142,14 @@ private:
{ {
sz = LZ4_compress_fast_continue( m_stream, m_buf, lz4, m_offset, LZ4Size, 1 ); sz = LZ4_compress_fast_continue( m_stream, m_buf, lz4, m_offset, LZ4Size, 1 );
} }
else if( m_streamZstd )
{
ZSTD_outBuffer out = { lz4, LZ4Size, 0 };
ZSTD_inBuffer in = { m_buf, m_offset, 0 };
const auto ret = ZSTD_compressStream2( m_streamZstd, &out, &in, ZSTD_e_flush );
assert( ret == 0 );
sz = out.pos;
}
else else
{ {
sz = LZ4_compress_HC_continue( m_streamHC, m_buf, lz4, m_offset, LZ4Size ); sz = LZ4_compress_HC_continue( m_streamHC, m_buf, lz4, m_offset, LZ4Size );
@ -141,10 +165,11 @@ private:
} }
enum { BufSize = 64 * 1024 }; enum { BufSize = 64 * 1024 };
enum { LZ4Size = LZ4_COMPRESSBOUND( BufSize ) }; enum { LZ4Size = std::max( LZ4_COMPRESSBOUND( BufSize ), ZSTD_COMPRESSBOUND( BufSize ) ) };
LZ4_stream_t* m_stream; LZ4_stream_t* m_stream;
LZ4_streamHC_t* m_streamHC; LZ4_streamHC_t* m_streamHC;
ZSTD_CStream* m_streamZstd;
FILE* m_file; FILE* m_file;
char m_bufData[2][BufSize]; char m_bufData[2][BufSize];
char* m_buf; char* m_buf;