mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-26 07:54:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store messages.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-10-14 14:28:04 +02:00
parent 8c7b60fbe6
commit fa8030009f
5 changed files with 69 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/TracyProfiler.cpp
View File

@ -193,7 +193,7 @@ bool Profiler::SendData( const char* data, size_t len )
bool Profiler::SendString( uint64_t str, const char* ptr, QueueType type )
{
assert( type == QueueType::StringData || type == QueueType::ThreadName || type == QueueType::CustomStringData || type == QueueType::PlotName );
assert( type == QueueType::StringData || type == QueueType::ThreadName || type == QueueType::CustomStringData || type == QueueType::PlotName || type == QueueType::MessageData );
QueueItem item;
item.hdr.type = type;
@ -269,6 +269,10 @@ bool Profiler::HandleServerQuery()
case ServerQueryPlotName:
SendString( ptr, (const char*)ptr, QueueType::PlotName );
break;
case ServerQueryMessage:
SendString( ptr, (const char*)ptr, QueueType::MessageData );
delete[] (const char*)ptr;
break;
default:
assert( false );
break;

1
common/TracyProtocol.hpp
View File

@ -23,6 +23,7 @@ enum ServerQuery : uint8_t
ServerQueryCustomString,
ServerQuerySourceLocation,
ServerQueryPlotName,
ServerQueryMessage,
};
enum { WelcomeMessageProgramNameSize = 64 };

2
common/TracyQueue.hpp
View File

@ -24,6 +24,7 @@ enum class QueueType : uint8_t
PlotData,
PlotName,
Message,
MessageData,
NUM_TYPES
};
@ -184,6 +185,7 @@ static const size_t QueueDataSize[] = {
sizeof( QueueHeader ) + sizeof( QueuePlotData ),
sizeof( QueueHeader ) + sizeof( QueueStringTransfer ), // plot name
sizeof( QueueHeader ) + sizeof( QueueMessage ),
sizeof( QueueHeader ) + sizeof( QueueStringTransfer ), // message data
};
static_assert( QueueItemSize == 32, "Queue item size not 32 bytes" );

49
server/TracyView.cpp
View File

@ -361,7 +361,7 @@ close:
void View::DispatchProcess( const QueueItem& ev )
{
if( ev.hdr.type == QueueType::CustomStringData || ev.hdr.type == QueueType::StringData || ev.hdr.type == QueueType::ThreadName || ev.hdr.type == QueueType::PlotName )
if( ev.hdr.type == QueueType::CustomStringData || ev.hdr.type == QueueType::StringData || ev.hdr.type == QueueType::ThreadName || ev.hdr.type == QueueType::PlotName || ev.hdr.type == QueueType::MessageData )
{
timeval tv;
tv.tv_sec = 0;
@ -383,10 +383,14 @@ void View::DispatchProcess( const QueueItem& ev )
{
AddThreadString( ev.stringTransfer.ptr, std::string( buf, buf+sz ) );
}
else
else if( ev.hdr.type == QueueType::PlotName )
{
HandlePlotName( ev.stringTransfer.ptr, std::string( buf, buf+sz ) );
}
else
{
AddMessageData( ev.stringTransfer.ptr, buf, sz );
}
}
else
{
@ -397,7 +401,7 @@ void View::DispatchProcess( const QueueItem& ev )
void View::DispatchProcess( const QueueItem& ev, const char*& ptr )
{
ptr += QueueDataSize[ev.hdr.idx];
if( ev.hdr.type == QueueType::CustomStringData || ev.hdr.type == QueueType::StringData || ev.hdr.type == QueueType::ThreadName || ev.hdr.type == QueueType::PlotName )
if( ev.hdr.type == QueueType::CustomStringData || ev.hdr.type == QueueType::StringData || ev.hdr.type == QueueType::ThreadName || ev.hdr.type == QueueType::PlotName || ev.hdr.type == QueueType::MessageData )
{
uint16_t sz;
memcpy( &sz, ptr, sizeof( sz ) );
@ -414,10 +418,14 @@ void View::DispatchProcess( const QueueItem& ev, const char*& ptr )
{
AddThreadString( ev.stringTransfer.ptr, std::string( ptr, ptr+sz ) );
}
else
else if( ev.hdr.type == QueueType::PlotName )
{
HandlePlotName( ev.stringTransfer.ptr, std::string( ptr, ptr+sz ) );
}
else
{
AddMessageData( ev.stringTransfer.ptr, ptr, sz );
}
ptr += sz;
}
else
@ -472,6 +480,9 @@ void View::Process( const QueueItem& ev )
case QueueType::PlotData:
ProcessPlotData( ev.plotData );
break;
case QueueType::Message:
ProcessMessage( ev.message );
break;
default:
assert( false );
break;
@ -660,6 +671,12 @@ void View::ProcessPlotData( const QueuePlotData& ev )
}
}
void View::ProcessMessage( const QueueMessage& ev )
{
m_pendingMessages.emplace( ev.text, MessagePending { int64_t( ev.time * m_timerMul ), ev.thread } );
ServerQuery( ServerQueryMessage, ev.text );
}
void View::CheckString( uint64_t ptr )
{
if( m_strings.find( ptr ) != m_strings.end() ) return;
@ -753,6 +770,30 @@ void View::AddSourceLocation( const QueueSourceLocation& srcloc )
m_sourceLocation.emplace( srcloc.ptr, srcloc );
}
void View::AddMessageData( uint64_t ptr, const char* str, size_t sz )
{
auto txt = new char[sz+1];
memcpy( txt, str, sz );
txt[sz] = '\0';
auto it = m_pendingMessages.find( ptr );
assert( it != m_pendingMessages.end() );
const auto& time = it->second.time;
const auto& thread = it->second.thread;
if( m_messages.empty() || m_messages.back()->time < time )
{
std::lock_guard<std::mutex> lock( m_lock );
m_messages.push_back( new MessageData { time, txt } );
}
else
{
auto mit = std::lower_bound( m_messages.begin(), m_messages.end(), time, [] ( const auto& lhs, const auto& rhs ) { return lhs->time < rhs; } );
std::lock_guard<std::mutex> lock( m_lock );
m_messages.insert( mit, new MessageData { time, txt } );
}
m_pendingMessages.erase( it );
}
void View::NewZone( Event* zone, uint64_t thread )
{
m_zonesCnt++;

16
server/TracyView.hpp
View File

@ -77,6 +77,18 @@ private:
std::vector<PlotItem> data;
};
struct MessagePending
{
int64_t time;
uint64_t thread;
};
struct MessageData
{
int64_t time;
const char* txt;
};
void Worker();
void DispatchProcess( const QueueItem& ev );
@ -95,6 +107,7 @@ private:
void ProcessLockRelease( const QueueLockRelease& ev );
void ProcessLockMark( const QueueLockMark& ev );
void ProcessPlotData( const QueuePlotData& ev );
void ProcessMessage( const QueueMessage& ev );
void CheckString( uint64_t ptr );
void CheckThreadString( uint64_t id );
@ -105,6 +118,7 @@ private:
void AddThreadString( uint64_t id, std::string&& str );
void AddCustomString( uint64_t ptr, std::string&& str );
void AddSourceLocation( const QueueSourceLocation& srcloc );
void AddMessageData( uint64_t ptr, const char* str, size_t sz );
void NewZone( Event* zone, uint64_t thread );
void UpdateZone( Event* zone );
@ -168,6 +182,7 @@ private:
Vector<uint64_t> m_frames;
Vector<ThreadData*> m_threads;
Vector<PlotData*> m_plots;
Vector<MessageData*> m_messages;
std::unordered_map<uint64_t, std::string> m_strings;
std::unordered_map<uint64_t, std::string> m_threadNames;
std::unordered_set<const char*, charutil::Hasher, charutil::Comparator> m_customStrings;
@ -188,6 +203,7 @@ private:
std::unordered_map<uint64_t, uint32_t> m_plotMap;
std::unordered_map<std::string, uint32_t> m_plotRev;
std::unordered_map<uint64_t, PlotData*> m_pendingPlots;
std::unordered_map<uint64_t, MessagePending> m_pendingMessages;
Slab<EventSize*1024*1024> m_slab;