From 89dd2446936c16d78fd09f415b970371ca3b2b87 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Wed, 13 Sep 2017 23:40:28 +0200 Subject: [PATCH] Read QueueItems from network. --- server/TracyView.cpp | 38 ++++++++++++++++++++++++++++++++++++-- server/TracyView.hpp | 3 +++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 6f9e6339..15a1a024 100755 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -6,8 +6,11 @@ #include +#include "../common/tracy_lz4.hpp" +#include "../common/TracyProtocol.hpp" #include "../common/TracySocket.hpp" #include "../common/TracySystem.hpp" +#include "../common/TracyQueue.hpp" #include "TracyView.hpp" namespace tracy @@ -61,8 +64,34 @@ void View::Worker() for(;;) { if( m_shutdown.load( std::memory_order_relaxed ) ) return; - char buf[16*1024]; - if( sock.Recv( buf, 16*1024, &tv ) == 0 ) break; + + if( lz4 ) + { + char buf[TargetFrameSize]; + char lz4buf[LZ4Size]; + lz4sz_t lz4sz; + if( !sock.Read( &lz4sz, sizeof( lz4sz ), &tv, ShouldExit ) ) goto close; + if( !sock.Read( lz4buf, lz4sz, &tv, ShouldExit ) ) goto close; + + auto sz = LZ4_decompress_safe( lz4buf, buf, lz4sz, TargetFrameSize ); + assert( sz >= 0 ); + + const char* ptr = buf; + const char* end = buf + sz; + while( ptr < end ) + { + auto ev = (QueueItem*)ptr; + Process( *ev ); + ptr += QueueDataSize[(uint8_t)ev->hdr.type]; + } + } + else + { + QueueItem hdr; + if( !sock.Read( &hdr.hdr, sizeof( QueueHeader ), &tv, ShouldExit ) ) goto close; + if( !sock.Read( ((char*)&hdr) + sizeof( QueueHeader ), QueueDataSize[(uint8_t)hdr.hdr.type] - sizeof( QueueHeader ), &tv, ShouldExit ) ) goto close; + Process( hdr ); + } } close: @@ -70,4 +99,9 @@ close: } } +void View::Process( const QueueItem& ev ) +{ + +} + } diff --git a/server/TracyView.hpp b/server/TracyView.hpp index 46667237..8191c2a8 100755 --- a/server/TracyView.hpp +++ b/server/TracyView.hpp @@ -8,6 +8,8 @@ namespace tracy { +struct QueueItem; + class View { public: @@ -19,6 +21,7 @@ public: private: void Worker(); + void Process( const QueueItem& ev ); std::string m_addr;