mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-05-02 05:33:53 +00:00
Code Issues Releases Wiki Activity

Use StringDiscovery for plots.

Browse Source
This commit is contained in:
Bartosz Taudul 2018-08-04 16:33:03 +02:00
parent d2c866377e
commit ada9f78678
2 changed files with 28 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
server/TracyWorker.cpp
View File

@ -626,7 +626,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
f.Read( sz ); f.Read( sz );
if( eventMask & EventType::Plots ) if( eventMask & EventType::Plots )
{ {
m_data.plots.reserve( sz ); m_data.plots.Data().reserve( sz );
s_loadProgress.subTotal.store( sz, std::memory_order_relaxed ); s_loadProgress.subTotal.store( sz, std::memory_order_relaxed );
for( uint64_t i=0; i<sz; i++ ) for( uint64_t i=0; i<sz; i++ )
{ {
@ -640,7 +640,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
f.Read( psz ); f.Read( psz );
pd->data.reserve_and_use( psz ); pd->data.reserve_and_use( psz );
f.Read( pd->data.data(), psz * sizeof( PlotItem ) ); f.Read( pd->data.data(), psz * sizeof( PlotItem ) );
m_data.plots.push_back_no_space_check( pd ); m_data.plots.Data().push_back_no_space_check( pd );
} }
} }
else else
@ -821,7 +821,7 @@ Worker::~Worker()
v->timeline.~Vector(); v->timeline.~Vector();
v->stack.~Vector(); v->stack.~Vector();
} }
for( auto& v : m_data.plots ) for( auto& v : m_data.plots.Data() )
{ {
v->~PlotData(); v->~PlotData();
} }
@ -1180,7 +1180,7 @@ void Worker::Exec()
if( m_terminate ) if( m_terminate )
{ {
if( m_pendingStrings != 0 || m_pendingThreads != 0 || m_pendingSourceLocation != 0 || m_pendingCallstackFrames != 0 || if( m_pendingStrings != 0 || m_pendingThreads != 0 || m_pendingSourceLocation != 0 || m_pendingCallstackFrames != 0 ||
!m_pendingCustomStrings.empty() || !m_pendingPlots.empty() || !m_pendingCallstacks.empty() ) !m_pendingCustomStrings.empty() || m_data.plots.IsPending() || !m_pendingCallstacks.empty() )
{ {
continue; continue;
} }
@ -1612,36 +1612,22 @@ void Worker::InsertPlot( PlotData* plot, int64_t time, double val )
void Worker::HandlePlotName( uint64_t name, char* str, size_t sz ) void Worker::HandlePlotName( uint64_t name, char* str, size_t sz )
{ {
auto pit = m_pendingPlots.find( name );
assert( pit != m_pendingPlots.end() );
const auto sl = StoreString( str, sz ); const auto sl = StoreString( str, sz );
bool addString = m_data.plots.StringDiscovered( name, sl, [this] ( PlotData* dst, PlotData* src ) {
auto it = m_plotRev.find( sl.ptr ); for( auto& v : src->data )
if( it == m_plotRev.end() ) {
InsertPlot( dst, v.time, v.val );
}
} );
if( addString )
{ {
m_plotMap.emplace( name, pit->second );
m_plotRev.emplace( sl.ptr, pit->second );
m_data.plots.push_back( pit->second );
m_data.strings.emplace( name, sl.ptr ); m_data.strings.emplace( name, sl.ptr );
} }
else
{
auto plot = it->second;
m_plotMap.emplace( name, plot );
const auto& pp = pit->second->data;
for( auto& v : pp )
{
InsertPlot( plot, v.time, v.val );
}
}
m_pendingPlots.erase( pit );
} }
void Worker::HandlePostponedPlots() void Worker::HandlePostponedPlots()
{ {
for( auto& plot : m_data.plots ) for( auto& plot : m_data.plots.Data() )
{ {
auto& src = plot->postpone; auto& src = plot->postpone;
if( src.empty() ) continue; if( src.empty() ) continue;
@ -2074,28 +2060,14 @@ void Worker::ProcessLockMark( const QueueLockMark& ev )
void Worker::ProcessPlotData( const QueuePlotData& ev ) void Worker::ProcessPlotData( const QueuePlotData& ev )
{ {
PlotData* plot; PlotData* plot = m_data.plots.Retrieve( ev.name, [this] ( uint64_t name ) {
auto it = m_plotMap.find( ev.name ); auto plot = m_slab.AllocInit<PlotData>();
if( it == m_plotMap.end() ) plot->name = name;
{
auto pit = m_pendingPlots.find( ev.name );
if( pit == m_pendingPlots.end() )
{
plot = m_slab.AllocInit<PlotData>();
plot->name = ev.name;
plot->type = PlotType::User; plot->type = PlotType::User;
m_pendingPlots.emplace( ev.name, plot ); return plot;
ServerQuery( ServerQueryPlotName, ev.name ); }, [this]( uint64_t name ) {
} ServerQuery( ServerQueryPlotName, name );
else } );
{
plot = pit->second;
}
}
else
{
plot = it->second;
}
const auto time = TscTime( ev.time ); const auto time = TscTime( ev.time );
m_data.lastTime = std::max( m_data.lastTime, time ); m_data.lastTime = std::max( m_data.lastTime, time );
@ -2462,7 +2434,7 @@ void Worker::CreateMemAllocPlot()
m_data.memory.plot->name = 0; m_data.memory.plot->name = 0;
m_data.memory.plot->type = PlotType::Memory; m_data.memory.plot->type = PlotType::Memory;
m_data.memory.plot->data.push_back( { GetFrameBegin( 0 ), 0. } ); m_data.memory.plot->data.push_back( { GetFrameBegin( 0 ), 0. } );
m_data.plots.push_back( m_data.memory.plot ); m_data.plots.Data().push_back( m_data.memory.plot );
} }
void Worker::ReconstructMemAllocPlot() void Worker::ReconstructMemAllocPlot()
@ -2561,7 +2533,7 @@ void Worker::ReconstructMemAllocPlot()
plot->max = max; plot->max = max;
std::lock_guard<TracyMutex> lock( m_data.lock ); std::lock_guard<TracyMutex> lock( m_data.lock );
m_data.plots.insert( m_data.plots.begin(), plot ); m_data.plots.Data().insert( m_data.plots.Data().begin(), plot );
m_data.memory.plot = plot; m_data.memory.plot = plot;
} }
@ -2917,10 +2889,10 @@ void Worker::Write( FileWrite& f )
WriteTimeline( f, ctx->timeline ); WriteTimeline( f, ctx->timeline );
} }
sz = m_data.plots.size(); sz = m_data.plots.Data().size();
for( auto& plot : m_data.plots ) { if( plot->type != PlotType::User ) sz--; } for( auto& plot : m_data.plots.Data() ) { if( plot->type != PlotType::User ) sz--; }
f.Write( &sz, sizeof( sz ) ); f.Write( &sz, sizeof( sz ) );
for( auto& plot : m_data.plots ) for( auto& plot : m_data.plots.Data() )
{ {
if( plot->type != PlotType::User ) continue; if( plot->type != PlotType::User ) continue;
f.Write( &plot->name, sizeof( plot->name ) ); f.Write( &plot->name, sizeof( plot->name ) );

8
server/TracyWorker.hpp
View File

@ -17,6 +17,7 @@
#include "tracy_flat_hash_map.hpp" #include "tracy_flat_hash_map.hpp"
#include "TracyEvent.hpp" #include "TracyEvent.hpp"
#include "TracySlab.hpp" #include "TracySlab.hpp"
#include "TracyStringDiscovery.hpp"
#include "TracyVarArray.hpp" #include "TracyVarArray.hpp"
namespace tracy namespace tracy
@ -103,7 +104,7 @@ private:
Vector<int64_t> frames; Vector<int64_t> frames;
Vector<GpuCtxData*> gpuData; Vector<GpuCtxData*> gpuData;
Vector<MessageData*> messages; Vector<MessageData*> messages;
Vector<PlotData*> plots; StringDiscovery<PlotData*> plots;
Vector<ThreadData*> threads; Vector<ThreadData*> threads;
MemData memory; MemData memory;
uint64_t zonesCnt; uint64_t zonesCnt;
@ -189,7 +190,7 @@ public:
const std::map<uint32_t, LockMap>& GetLockMap() const { return m_data.lockMap; } const std::map<uint32_t, LockMap>& GetLockMap() const { return m_data.lockMap; }
const Vector<MessageData*>& GetMessages() const { return m_data.messages; } const Vector<MessageData*>& GetMessages() const { return m_data.messages; }
const Vector<GpuCtxData*>& GetGpuData() const { return m_data.gpuData; } const Vector<GpuCtxData*>& GetGpuData() const { return m_data.gpuData; }
const Vector<PlotData*>& GetPlots() const { return m_data.plots; } const Vector<PlotData*>& GetPlots() const { return m_data.plots.Data(); }
const Vector<ThreadData*>& GetThreadData() const { return m_data.threads; } const Vector<ThreadData*>& GetThreadData() const { return m_data.threads; }
const MemData& GetMemData() const { return m_data.memory; } const MemData& GetMemData() const { return m_data.memory; }
@ -367,10 +368,7 @@ private:
GpuCtxData* m_gpuCtxMap[256]; GpuCtxData* m_gpuCtxMap[256];
flat_hash_map<uint64_t, StringLocation, nohash<uint64_t>> m_pendingCustomStrings; flat_hash_map<uint64_t, StringLocation, nohash<uint64_t>> m_pendingCustomStrings;
flat_hash_map<uint64_t, PlotData*, nohash<uint64_t>> m_pendingPlots;
flat_hash_map<uint64_t, uint32_t> m_pendingCallstacks; flat_hash_map<uint64_t, uint32_t> m_pendingCallstacks;
flat_hash_map<uint64_t, PlotData*, nohash<uint64_t>> m_plotMap;
flat_hash_map<const char*, PlotData*, charutil::HasherPOT, charutil::Comparator> m_plotRev;
flat_hash_map<uint64_t, int32_t, nohash<uint64_t>> m_pendingSourceLocationPayload; flat_hash_map<uint64_t, int32_t, nohash<uint64_t>> m_pendingSourceLocationPayload;
Vector<uint64_t> m_sourceLocationQueue; Vector<uint64_t> m_sourceLocationQueue;
flat_hash_map<uint64_t, uint32_t, nohash<uint64_t>> m_sourceLocationShrink; flat_hash_map<uint64_t, uint32_t, nohash<uint64_t>> m_sourceLocationShrink;