mirror of
https://github.com/wolfpld/tracy.git
synced 2024-11-27 00:04:35 +00:00
Silence some type mismatch warnings.
This commit is contained in:
parent
3554e4c4ac
commit
31fc2335dd
@ -174,7 +174,7 @@ void Profiler::Worker()
|
|||||||
ptr += dsz;
|
ptr += dsz;
|
||||||
}
|
}
|
||||||
if( !SendData( buf, ptr - buf ) ) break;
|
if( !SendData( buf, ptr - buf ) ) break;
|
||||||
m_bufferOffset += ptr - buf;
|
m_bufferOffset += int( ptr - buf );
|
||||||
if( m_bufferOffset > TargetFrameSize * 2 ) m_bufferOffset = 0;
|
if( m_bufferOffset > TargetFrameSize * 2 ) m_bufferOffset = 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -193,7 +193,7 @@ void Profiler::Worker()
|
|||||||
bool Profiler::SendData( const char* data, size_t len )
|
bool Profiler::SendData( const char* data, size_t len )
|
||||||
{
|
{
|
||||||
#ifdef DISABLE_LZ4
|
#ifdef DISABLE_LZ4
|
||||||
if( m_sock->Send( data, len ) == -1 ) return false;
|
if( m_sock->Send( data, (int)len ) == -1 ) return false;
|
||||||
#else
|
#else
|
||||||
char lz4[LZ4Size + sizeof( lz4sz_t )];
|
char lz4[LZ4Size + sizeof( lz4sz_t )];
|
||||||
const lz4sz_t lz4sz = LZ4_compress_fast_continue( m_stream, data, lz4 + sizeof( lz4sz_t ), len, LZ4Size, 1 );
|
const lz4sz_t lz4sz = LZ4_compress_fast_continue( m_stream, data, lz4 + sizeof( lz4sz_t ), len, LZ4Size, 1 );
|
||||||
@ -219,11 +219,11 @@ bool Profiler::SendString( uint64_t str, const char* ptr, QueueType type )
|
|||||||
auto len = strlen( ptr );
|
auto len = strlen( ptr );
|
||||||
assert( len < TargetFrameSize - isz - sizeof( uint16_t ) );
|
assert( len < TargetFrameSize - isz - sizeof( uint16_t ) );
|
||||||
assert( len <= std::numeric_limits<uint16_t>::max() );
|
assert( len <= std::numeric_limits<uint16_t>::max() );
|
||||||
uint16_t l16 = len;
|
auto l16 = uint16_t( len );
|
||||||
memcpy( buf + isz, &l16, sizeof( l16 ) );
|
memcpy( buf + isz, &l16, sizeof( l16 ) );
|
||||||
memcpy( buf + isz + sizeof( l16 ), ptr, l16 );
|
memcpy( buf + isz + sizeof( l16 ), ptr, l16 );
|
||||||
|
|
||||||
m_bufferOffset += isz + sizeof( l16 ) + l16;
|
m_bufferOffset += int( isz + sizeof( l16 ) + l16 );
|
||||||
if( m_bufferOffset > TargetFrameSize * 2 ) m_bufferOffset = 0;
|
if( m_bufferOffset > TargetFrameSize * 2 ) m_bufferOffset = 0;
|
||||||
|
|
||||||
return SendData( buf, isz + sizeof( l16 ) + l16 );
|
return SendData( buf, isz + sizeof( l16 ) + l16 );
|
||||||
@ -364,7 +364,7 @@ void Profiler::CalibrateDelay()
|
|||||||
const auto f0 = GetTime( cpu );
|
const auto f0 = GetTime( cpu );
|
||||||
for( int i=0; i<Iterations; i++ )
|
for( int i=0; i<Iterations; i++ )
|
||||||
{
|
{
|
||||||
static const tracy::SourceLocation __tracy_source_location { __FUNCTION__, __FILE__, __LINE__, 0 };
|
static const tracy::SourceLocation __tracy_source_location { __FUNCTION__, __FILE__, (uint32_t)__LINE__, 0 };
|
||||||
FakeZone ___tracy_scoped_zone( &__tracy_source_location );
|
FakeZone ___tracy_scoped_zone( &__tracy_source_location );
|
||||||
}
|
}
|
||||||
const auto t0 = GetTime( cpu );
|
const auto t0 = GetTime( cpu );
|
||||||
@ -396,7 +396,7 @@ void Profiler::CalibrateDelay()
|
|||||||
const auto df = t0 - f0;
|
const auto df = t0 - f0;
|
||||||
m_delay = ( dt - df ) / Events;
|
m_delay = ( dt - df ) / Events;
|
||||||
|
|
||||||
uint64_t mindiff = std::numeric_limits<uint64_t>::max();
|
auto mindiff = std::numeric_limits<int64_t>::max();
|
||||||
for( int i=0; i<Iterations * 10; i++ )
|
for( int i=0; i<Iterations * 10; i++ )
|
||||||
{
|
{
|
||||||
const auto t0 = GetTime( cpu );
|
const auto t0 = GetTime( cpu );
|
||||||
@ -415,7 +415,7 @@ void Profiler::CalibrateDelay()
|
|||||||
{
|
{
|
||||||
const auto sz = s_queue.try_dequeue_bulk( token, item, std::min( left, (int)Bulk ) );
|
const auto sz = s_queue.try_dequeue_bulk( token, item, std::min( left, (int)Bulk ) );
|
||||||
assert( sz > 0 );
|
assert( sz > 0 );
|
||||||
left -= sz;
|
left -= (int)sz;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -119,7 +119,7 @@ int Socket::Send( const void* _buf, int len )
|
|||||||
len -= ret;
|
len -= ret;
|
||||||
buf += ret;
|
buf += ret;
|
||||||
}
|
}
|
||||||
return buf - start;
|
return int( buf - start );
|
||||||
}
|
}
|
||||||
|
|
||||||
int Socket::Recv( void* _buf, int len, const timeval* tv )
|
int Socket::Recv( void* _buf, int len, const timeval* tv )
|
||||||
|
Loading…
Reference in New Issue
Block a user