mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-09-20 05:42:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use std::string to pass strings.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-11-10 18:39:43 +01:00
parent d9bdd56208
commit 51459d724c
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/TracyView.cpp
View File

@ -538,7 +538,7 @@ void View::DispatchProcess( const QueueItem& ev, const char*& ptr )
switch( ev.hdr.type ) switch( ev.hdr.type )
{ {
case QueueType::CustomStringData: case QueueType::CustomStringData:
AddCustomString( ev.stringTransfer.ptr, std::string( ptr, ptr+sz ) ); AddCustomString( ev.stringTransfer.ptr, ptr, sz );
break; break;
case QueueType::StringData: case QueueType::StringData:
AddString( ev.stringTransfer.ptr, std::string( ptr, ptr+sz ) ); AddString( ev.stringTransfer.ptr, std::string( ptr, ptr+sz ) );
@ -916,26 +916,33 @@ void View::AddThreadString( uint64_t id, std::string&& str )
m_threadNames.emplace( id, std::move( str ) ); m_threadNames.emplace( id, std::move( str ) );
} }
void View::AddCustomString( uint64_t ptr, const std::string& str ) void View::AddCustomString( uint64_t ptr, const char* str, size_t sz )
{ {
auto pit = m_pendingCustomStrings.find( ptr ); auto pit = m_pendingCustomStrings.find( ptr );
assert( pit != m_pendingCustomStrings.end() ); assert( pit != m_pendingCustomStrings.end() );
const auto sl = StoreString( str ); const auto sl = StoreString( str, sz );
m_lock.lock(); m_lock.lock();
GetTextData( *pit->second )->userText = sl.ptr; GetTextData( *pit->second )->userText = sl.ptr;
m_lock.unlock(); m_lock.unlock();
m_pendingCustomStrings.erase( pit ); m_pendingCustomStrings.erase( pit );
} }
View::StringLocation View::StoreString( const std::string& str ) View::StringLocation View::StoreString( const char* str, size_t sz )
{ {
StringLocation ret; StringLocation ret;
auto sit = m_stringMap.find( str.c_str() );
// TODO: Remove this temporary buffer. Requires custom map implementation.
enum { BufSize = 16*1024 };
char buf[BufSize];
assert( sz < BufSize );
memcpy( buf, str, sz );
buf[sz] = '\0';
auto sit = m_stringMap.find( buf );
if( sit == m_stringMap.end() ) if( sit == m_stringMap.end() )
{ {
const auto sz = str.size();
auto ptr = m_slab.Alloc<char>( sz+1 ); auto ptr = m_slab.Alloc<char>( sz+1 );
memcpy( ptr, str.c_str(), sz ); memcpy( ptr, str, sz );
ptr[sz] = '\0'; ptr[sz] = '\0';
ret.ptr = ptr; ret.ptr = ptr;
ret.idx = m_stringData.size(); ret.idx = m_stringData.size();

4
server/TracyView.hpp
View File

@ -150,12 +150,12 @@ private:
void AddString( uint64_t ptr, std::string&& str ); void AddString( uint64_t ptr, std::string&& str );
void AddThreadString( uint64_t id, std::string&& str ); void AddThreadString( uint64_t id, std::string&& str );
void AddCustomString( uint64_t ptr, const std::string& str ); void AddCustomString( uint64_t ptr, const char* str, size_t sz );
void AddSourceLocation( const QueueSourceLocation& srcloc ); void AddSourceLocation( const QueueSourceLocation& srcloc );
void AddSourceLocationPayload( uint64_t ptr, const char* data, size_t sz ); void AddSourceLocationPayload( uint64_t ptr, const char* data, size_t sz );
void AddMessageData( uint64_t ptr, const char* str, size_t sz ); void AddMessageData( uint64_t ptr, const char* str, size_t sz );
StringLocation StoreString( const std::string& str ); StringLocation StoreString( const char* str, size_t sz );
uint32_t ShrinkSourceLocation( uint64_t srcloc ); uint32_t ShrinkSourceLocation( uint64_t srcloc );