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

Reading zstd compressed traces.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-02-08 16:14:18 +01:00
parent 817e052457
commit ec5c7cf8a7
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
server/TracyFileRead.hpp
View File

@ -1,6 +1,7 @@
#ifndef __TRACYFILEREAD_HPP__ #ifndef __TRACYFILEREAD_HPP__
#define __TRACYFILEREAD_HPP__ #define __TRACYFILEREAD_HPP__
#include <assert.h>
#include <atomic> #include <atomic>
#include <algorithm> #include <algorithm>
#include <stdexcept> #include <stdexcept>
@ -8,11 +9,13 @@
#include <string.h> #include <string.h>
#include <string> #include <string>
#include <thread> #include <thread>
#include <utility>
#include "TracyFileHeader.hpp" #include "TracyFileHeader.hpp"
#include "TracyYield.hpp" #include "TracyYield.hpp"
#include "../common/tracy_lz4.hpp" #include "../common/tracy_lz4.hpp"
#include "../common/TracyForceInline.hpp" #include "../common/TracyForceInline.hpp"
#include "../zstd/zstd.h"
namespace tracy namespace tracy
{ {
@ -34,7 +37,8 @@ public:
m_decThread.join(); m_decThread.join();
fclose( m_file ); fclose( m_file );
LZ4_freeStreamDecode( m_stream ); if( m_stream ) LZ4_freeStreamDecode( m_stream );
if( m_streamZstd ) ZSTD_freeDStream( m_streamZstd );
} }
tracy_force_inline void Read( void* ptr, size_t size ) tracy_force_inline void Read( void* ptr, size_t size )
@ -153,7 +157,8 @@ public:
private: private:
FileRead( FILE* f, const char* fn ) FileRead( FILE* f, const char* fn )
: m_stream( LZ4_createStreamDecode() ) : m_stream( nullptr )
, m_streamZstd( nullptr )
, m_file( f ) , m_file( f )
, m_buf( m_bufData[1] ) , m_buf( m_bufData[1] )
, m_second( m_bufData[0] ) , m_second( m_bufData[0] )
@ -166,13 +171,13 @@ private:
{ {
char hdr[4]; char hdr[4];
if( fread( hdr, 1, sizeof( hdr ), m_file ) != sizeof( hdr ) ) throw NotTracyDump(); if( fread( hdr, 1, sizeof( hdr ), m_file ) != sizeof( hdr ) ) throw NotTracyDump();
if( memcmp( hdr, Lz4Header, sizeof( hdr ) ) != 0 ) if( memcmp( hdr, Lz4Header, sizeof( hdr ) ) == 0 )
{ {
fseek( m_file, 0, SEEK_SET ); m_stream = LZ4_createStreamDecode();
uint32_t sz; }
static_assert( sizeof( sz ) == sizeof( hdr ), "Size mismatch" ); else if( memcmp( hdr, ZstdHeader, sizeof( hdr ) ) == 0 )
memcpy( &sz, hdr, sizeof( sz ) ); {
if( sz > LZ4Size ) throw NotTracyDump(); m_streamZstd = ZSTD_createDStream();
} }
ReadBlock(); ReadBlock();
@ -249,7 +254,18 @@ private:
if( fread( &sz, 1, sizeof( sz ), m_file ) == sizeof( sz ) ) if( fread( &sz, 1, sizeof( sz ), m_file ) == sizeof( sz ) )
{ {
fread( m_lz4buf, 1, sz, m_file ); fread( m_lz4buf, 1, sz, m_file );
m_lastBlock = (size_t)LZ4_decompress_safe_continue( m_stream, m_lz4buf, m_second, sz, BufSize ); if( m_stream )
{
m_lastBlock = (size_t)LZ4_decompress_safe_continue( m_stream, m_lz4buf, m_second, sz, BufSize );
}
else
{
ZSTD_outBuffer out = { m_second, BufSize, 0 };
ZSTD_inBuffer in = { m_lz4buf, sz, 0 };
const auto ret = ZSTD_decompressStream( m_streamZstd, &out, &in );
assert( ret > 0 );
m_lastBlock = out.pos;
}
} }
else else
{ {
@ -258,9 +274,10 @@ 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_streamDecode_t* m_stream; LZ4_streamDecode_t* m_stream;
ZSTD_DStream* m_streamZstd;
FILE* m_file; FILE* m_file;
char* m_buf; char* m_buf;
char* m_second; char* m_second;