mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-22 22:44:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Buffer data from recv() calls.

Browse Source 
This reduces cost of socket reads measured in a test run from 47ms to
8.7ms.
This commit is contained in:
Bartosz Taudul 2018-07-15 19:34:47 +02:00
parent c6ea032de3
commit ea4470b26e
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
common/TracySocket.cpp
View File

@ -1,3 +1,4 @@
#include <algorithm>
#include <assert.h>
#include <new>
#include <stdio.h>
@ -47,6 +48,9 @@ static __wsinit InitWinSock()
Socket::Socket()
: m_sock( -1 )
, m_buf( (char*)tracy_malloc( BufSize ) )
, m_bufPtr( nullptr )
, m_bufLeft( 0 )
{
#ifdef _MSC_VER
InitWinSock();
@ -55,11 +59,15 @@ Socket::Socket()
Socket::Socket( int sock )
: m_sock( sock )
, m_buf( (char*)tracy_malloc( BufSize ) )
, m_bufPtr( nullptr )
, m_bufLeft( 0 )
{
}
Socket::~Socket()
{
tracy_free( m_buf );
if( m_sock != -1 )
{
Close();
@ -130,6 +138,36 @@ int Socket::Send( const void* _buf, int len )
return int( buf - start );
}
int Socket::RecvBuffered( void* buf, int len, const timeval* tv )
{
if( len <= m_bufLeft )
{
memcpy( buf, m_bufPtr, len );
m_bufPtr += len;
m_bufLeft -= len;
return len;
}
if( m_bufLeft > 0 )
{
memcpy( buf, m_bufPtr, m_bufLeft );
const auto ret = m_bufLeft;
m_bufLeft = 0;
return ret;
}
if( len >= BufSize ) return Recv( buf, len, tv );
m_bufLeft = Recv( m_buf, BufSize, tv );
if( m_bufLeft <= 0 ) return m_bufLeft;
const auto sz = std::min( len, m_bufLeft );
memcpy( buf, m_buf, sz );
m_bufPtr = m_buf + sz;
m_bufLeft -= sz;
return sz;
}
int Socket::Recv( void* _buf, int len, const timeval* tv )
{
auto buf = (char*)_buf;
@ -161,7 +199,7 @@ bool Socket::Read( void* _buf, int len, const timeval* tv, std::function<bool()>
while( len > 0 )
{
if( exitCb() ) return false;
const auto sz = Recv( buf, len, tv );
const auto sz = RecvBuffered( buf, len, tv );
switch( sz )
{
case 0:

10
common/TracySocket.hpp
View File

@ -10,6 +10,8 @@ namespace tracy
class Socket
{
enum { BufSize = 128 * 1024 };
public:
Socket();
Socket( int sock );
@ -19,7 +21,6 @@ public:
void Close();
int Send( const void* buf, int len );
int Recv( void* buf, int len, const timeval* tv );
bool Read( void* buf, int len, const timeval* tv, std::function<bool()> exitCb );
bool HasData();
@ -30,7 +31,14 @@ public:
Socket& operator=( Socket&& ) = delete;
private:
int RecvBuffered( void* buf, int len, const timeval* tv );
int Recv( void* buf, int len, const timeval* tv );
int m_sock;
char* m_buf;
char* m_bufPtr;
int m_bufLeft;
};
class ListenSocket